diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html new file mode 100644 index 00000000..8ad17be0 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/address/view.html @@ -0,0 +1,102 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/feedback/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/feedback/view.html new file mode 100644 index 00000000..fa6cce74 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/feedback/view.html @@ -0,0 +1,92 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ +
+ +
+
+
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/add.html index 89833433..94c469f6 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/add.html @@ -23,11 +23,11 @@
- +
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/detail.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/detail.html new file mode 100755 index 00000000..8fdc1212 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/detail.html @@ -0,0 +1,215 @@ + + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+ +
+
+ +
+
+
+ + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/edit.html index 06601581..bb424b72 100755 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/edit.html @@ -15,11 +15,11 @@
- +
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html index c586177f..774566a0 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/medal/view.html @@ -56,15 +56,15 @@ }, { field: 'name', - title: '名称' + title: '奖章名称' + }, + { + field: 'hide', + title: '是否启用', + formatter: function (value, index) { + return value === 0 ? "否" : "是"; + } }, - // { - // field: 'hide', - // title: '隐藏', - // formatter: function (value, index) { - // return value === 0 ? "是" : "否"; - // } - // }, { field: 'creator', title: '创建人' @@ -79,8 +79,9 @@ formatter: function (value, row, index) { var actions = []; actions.push('编辑 '); + actions.push('查看 '); actions.push('删除'); - actions.push('上移'); + //actions.push('上移'); return actions.join(''); } }] diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html index f59eee59..755a7179 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/question/addNew.html @@ -68,7 +68,7 @@ + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/edit.html new file mode 100644 index 00000000..87c587f0 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/edit.html @@ -0,0 +1,42 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html new file mode 100644 index 00000000..fe37a7c9 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html @@ -0,0 +1,100 @@ + + + + + + +
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/edit.html new file mode 100644 index 00000000..f54b8836 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/edit.html @@ -0,0 +1,34 @@ + + + + + + +
+
+ +
+ +
+ +
+
+
+
+ + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html index 9015d727..6a982ca8 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/user/view.html @@ -14,10 +14,14 @@

昵称：

+
  • +

    电话：

    + +
  •  搜索 -  重置
    • @@ -52,18 +56,22 @@ columns: [{ checkbox: true }, - { - field: 'guid', - title: 'id' - }, { field: 'nickname', title: '昵称' }, + { + field: 'mobile', + title: '电话' + }, { field: 'gender', title: '性别' }, + { + field: 'province', + title: '省份' + }, { field: 'city', title: '城市' @@ -81,19 +89,15 @@ align: 'center', formatter: function (value, row, index) { var actions = []; - //actions.push('编辑 '); + actions.push('勋章 '); return actions.join(''); } - }] + } + ] }; $.table.init(options); }); - - function reset() { - $("[name='nickname']").val(""); - $.table.search() - } \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java index c3bccf76..bc7495b1 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMedalController.java @@ -55,7 +55,7 @@ public class SceneMedalController extends BaseController { @PostMapping("/listAll") @ResponseBody public ZDResponse listAll(@RequestBody SceneMedal sceneMedal) { - List list = sceneMedalService.selectSceneMedalListAll(sceneMedal); + List list = sceneMedalService.selectSceneMedalList(sceneMedal); return ZDResponse.success("成功", list); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneTextController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneTextController.java new file mode 100755 index 00000000..4ffe852d --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneTextController.java @@ -0,0 +1,122 @@ +package com.zdxt.knowledge.controller; + +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import com.zdxt.knowledge.domain.SceneText; +import com.zdxt.knowledge.service.ISceneTextService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 【请填写功能名称】Controller + * + * @author ruoyi + * @date 2023-01-22 + */ +@Controller +@RequestMapping("/small/project/text") +public class SceneTextController extends BaseController { + private String prefix = "project/text"; + + @Autowired + private ISceneTextService sceneTextService; + + @RequiresPermissions("project:text:view") + @GetMapping("/view") + public String manage() { + return prefix + "/view"; + } + + + /** + * 查询 + */ + @RequiresPermissions("project:text:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(SceneText sceneText) { + startPage(); + List list = sceneTextService.selectSceneTextList(sceneText); + return getDataTable(list); + } + + /** + * 查询 + */ + @PostMapping("/listAll") + @ResponseBody + public ZDResponse listAll(@RequestBody SceneText sceneText) { + List list = sceneTextService.selectSceneTextList(sceneText); + return ZDResponse.success("成功", list); + } + + /** + * 查看详情 + */ + @RequiresPermissions("project:text:detail") + @GetMapping("/detail/{guid}") + public String detail(@PathVariable("guid") String guid, ModelMap mmap) { + SceneText sceneText = sceneTextService.selectSceneTextById(guid); + mmap.put("sceneText", sceneText); + return prefix + "/detail"; + } + + /** + * 新增 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存 + */ + @RequiresPermissions("project:text:add") + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(SceneText sceneText) { + return sceneTextService.insertSceneText(sceneText) > 0 + ? ZDResponse.success() : ZDResponse.error("新增失败"); + } + + /** + * 修改 + */ + @GetMapping("/edit/{guid}") + public String edit(@PathVariable("guid") String guid, ModelMap mmap) { + SceneText sceneText = sceneTextService.selectSceneTextById(guid); + mmap.put("sceneText", sceneText); + return prefix + "/edit"; + } + + /** + * 修改保存 + */ + @RequiresPermissions("project:text:edit") + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(SceneText sceneText) { + return sceneTextService.updateSceneText(sceneText) > 0 + ? ZDResponse.success() : ZDResponse.error("编辑失败"); + } + + /** + * 删除 + */ + @RequiresPermissions("project:text:remove") + @PostMapping("/remove") + @ResponseBody + public ZDResponse remove(String ids) { + return sceneTextService.deleteSceneTextByIds(ids) > 0 + ? ZDResponse.success() : ZDResponse.error("删除失败"); + } + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserAddressController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserAddressController.java new file mode 100755 index 00000000..8b87ff34 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserAddressController.java @@ -0,0 +1,122 @@ +package com.zdxt.knowledge.controller; + +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import com.zdxt.knowledge.domain.UserAddress; +import com.zdxt.knowledge.service.IUserAddressService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 【请填写功能名称】Controller + * + * @author ruoyi + * @date 2023-01-22 + */ +@Controller +@RequestMapping("/small/project/address") +public class UserAddressController extends BaseController { + private String prefix = "project/address"; + + @Autowired + private IUserAddressService userAddressService; + + @RequiresPermissions("project:address:view") + @GetMapping("/view") + public String manage() { + return prefix + "/view"; + } + + + /** + * 查询 + */ + @RequiresPermissions("project:address:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(UserAddress userAddress) { + startPage(); + List list = userAddressService.selectUserAddressList(userAddress); + return getDataTable(list); + } + + /** + * 查询 + */ + @PostMapping("/listAll") + @ResponseBody + public ZDResponse listAll(@RequestBody UserAddress userAddress) { + List list = userAddressService.selectUserAddressList(userAddress); + return ZDResponse.success("成功", list); + } + + /** + * 查看详情 + */ + @RequiresPermissions("project:address:detail") + @GetMapping("/detail/{guid}") + public String detail(@PathVariable("guid") String guid, ModelMap mmap) { + UserAddress userAddress = userAddressService.selectUserAddressById(guid); + mmap.put("userAddress", userAddress); + return prefix + "/detail"; + } + + /** + * 新增 + */ + @GetMapping("/add") + public String add() { + return prefix + "/add"; + } + + /** + * 新增保存 + */ + @RequiresPermissions("project:address:add") + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(UserAddress userAddress) { + return userAddressService.insertUserAddress(userAddress) > 0 + ? ZDResponse.success() : ZDResponse.error("新增失败"); + } + + /** + * 修改 + */ + @GetMapping("/edit/{guid}") + public String edit(@PathVariable("guid") String guid, ModelMap mmap) { + UserAddress userAddress = userAddressService.selectUserAddressById(guid); + mmap.put("userAddress", userAddress); + return prefix + "/edit"; + } + + /** + * 修改保存 + */ + @RequiresPermissions("project:address:edit") + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(UserAddress userAddress) { + return userAddressService.updateUserAddress(userAddress) > 0 + ? ZDResponse.success() : ZDResponse.error("编辑失败"); + } + + /** + * 删除 + */ + @RequiresPermissions("project:address:remove") + @PostMapping("/remove") + @ResponseBody + public ZDResponse remove(String ids) { + return userAddressService.deleteUserAddressByIds(ids) > 0 + ? ZDResponse.success() : ZDResponse.error("删除失败"); + } + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserFeedbackController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserFeedbackController.java new file mode 100755 index 00000000..62e9d1f1 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/UserFeedbackController.java @@ -0,0 +1,92 @@ +package com.zdxt.knowledge.controller; + +import com.zdxt.common.ZDResponse; +import com.zdxt.common.controller.BaseController; +import com.zdxt.common.util.TableDataInfo; +import com.zdxt.knowledge.domain.UserFeedback; +import com.zdxt.knowledge.service.IUserFeedbackService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 【请填写功能名称】Controller + * + * @author ruoyi + * @date 2023-01-22 + */ +@Controller +@RequestMapping("/small/project/feedback") +public class UserFeedbackController extends BaseController { + private String prefix = "project/feedback"; + + @Autowired + private IUserFeedbackService userFeedbackService; + + @RequiresPermissions("project:feedback:view") + @GetMapping("/view") + public String manage() { + return prefix + "/view"; + } + + + /** + * 查询 + */ + @RequiresPermissions("project:feedback:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(UserFeedback userFeedback) { + startPage(); + List list = userFeedbackService.selectUserFeedbackList(userFeedback); + return getDataTable(list); + } + + /** + * 查询 + */ + @PostMapping("/listAll") + @ResponseBody + public ZDResponse listAll(@RequestBody UserFeedback userFeedback) { + List list = userFeedbackService.selectUserFeedbackList(userFeedback); + return ZDResponse.success("成功", list); + } + + /** + * 查看详情 + */ + @RequiresPermissions("project:feedback:detail") + @GetMapping("/detail/{guid}") + public String detail(@PathVariable("guid") String guid, ModelMap mmap) { + UserFeedback userFeedback = userFeedbackService.selectUserFeedbackById(guid); + mmap.put("userFeedback", userFeedback); + return prefix + "/detail"; + } + + /** + * 新增保存 + */ + @PostMapping("/add") + @ResponseBody + public ZDResponse addSave(@RequestBody UserFeedback userFeedback) { + return userFeedbackService.insertUserFeedback(userFeedback) > 0 + ? ZDResponse.success() : ZDResponse.error("新增失败"); + } + + /** + * 删除 + */ + @RequiresPermissions("project:feedback:remove") + @PostMapping("/remove") + @ResponseBody + public ZDResponse remove(String ids) { + return userFeedbackService.deleteUserFeedbackByIds(ids) > 0 + ? ZDResponse.success() : ZDResponse.error("删除失败"); + } + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java index 64893759..64281ac9 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/WechatLoginController.java @@ -1,14 +1,18 @@ package com.zdxt.knowledge.controller; +import com.zdxt.common.ZDResponse; import com.zdxt.common.controller.BaseController; import com.zdxt.common.util.TableDataInfo; +import com.zdxt.knowledge.domain.SceneMedal; import com.zdxt.knowledge.domain.WechatLoginRequest; import com.zdxt.knowledge.domain.WechatUser; +import com.zdxt.knowledge.service.ISceneMedalService; import com.zdxt.knowledge.service.WechatService; import io.swagger.annotations.ApiOperation; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -29,6 +33,9 @@ public class WechatLoginController extends BaseController { @Autowired private WechatService wechatService; + @Autowired + private ISceneMedalService sceneMedalService; + private String prefix = "project/user"; @RequiresPermissions("project:user:view") @@ -37,7 +44,6 @@ public class WechatLoginController extends BaseController { return prefix + "/view"; } - /** * 查询 */ @@ -50,6 +56,29 @@ public class WechatLoginController extends BaseController { return getDataTable(list); } + /** + * 修改 + */ + @GetMapping("/edit/{guid}") + public String edit(@PathVariable("guid") String guid, ModelMap mmap) { + WechatUser user = wechatService.selectUserById(guid); + List sceneMedalList = sceneMedalService.selectSceneMedalList(new SceneMedal()); + mmap.put("user", user); + mmap.put("sceneMedalList", sceneMedalList); + return prefix + "/edit"; + } + + /** + * 修改保存 + */ + @RequiresPermissions("project:user:edit") + @PostMapping("/edit") + @ResponseBody + public ZDResponse editSave(WechatUser wechatUser) { + return wechatService.update(wechatUser) > 0 + ? ZDResponse.success() : ZDResponse.error("编辑失败"); + } + /** * 登入 */ @@ -60,4 +89,13 @@ public class WechatLoginController extends BaseController { Map userInfoMap = wechatService.getUserInfoMap(loginRequest); return userInfoMap; } + + /** + * 查看我的勋章 + */ + @PostMapping("/showMyMedal") + @ResponseBody + public ZDResponse showMyMedal(@RequestBody WechatUser wechatUser) { + return wechatService.showMyMedal(wechatUser); + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java index 35b99970..2bfb8431 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMedal.java @@ -31,9 +31,9 @@ public class SceneMedal implements Serializable { private String iconPath; /** - * 获取时展示的图标 + * 是否启用 */ - private String earnIconPath; + private Integer hide; /** * 创建人 @@ -86,14 +86,6 @@ public class SceneMedal implements Serializable { this.iconPath = iconPath; } - public String getEarnIconPath() { - return earnIconPath; - } - - public void setEarnIconPath(String earnIconPath) { - this.earnIconPath = earnIconPath; - } - public String getCreator() { return creator; } @@ -125,4 +117,12 @@ public class SceneMedal implements Serializable { public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } + + public Integer getHide() { + return hide; + } + + public void setHide(Integer hide) { + this.hide = hide; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneText.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneText.java new file mode 100644 index 00000000..da04b469 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneText.java @@ -0,0 +1,125 @@ +package com.zdxt.knowledge.domain; + +import io.swagger.models.auth.In; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.Map; + +/** + * 用户反馈 scene_text + * + * @author ruoyi + * @date 2023-01-24 + */ +public class SceneText implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String guid; + + /** + * 配置内容 + */ + private String content; + + /** + * 类型 + */ + private Integer type; + + /** + * 创建人 + */ + private String creator; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 创建人 + */ + private String updateBy; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updateTime; + + /** + * 请求参数 + */ + private Map params; + + public String getGuid() { + return guid; + } + + public void setGuid(String guid) { + this.guid = guid; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public Map getParams() { + return params; + } + + public void setParams(Map params) { + this.params = params; + } + + public String getUpdateBy() { + return updateBy; + } + + public void setUpdateBy(String updateBy) { + this.updateBy = updateBy; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/UserAddress.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/UserAddress.java new file mode 100644 index 00000000..8ab3d47c --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/UserAddress.java @@ -0,0 +1,114 @@ +package com.zdxt.knowledge.domain; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.Map; + +/** + * 用户反馈 user_address + * + * @author ruoyi + * @date 2023-01-24 + */ +public class UserAddress implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String guid; + + /** + * 用户id + */ + private String userId; + + /** + * 收货人姓名 + */ + private String name; + + /** + * 收获详情地址 + */ + private String address; + + /** + * 手机号码 + */ + private String mobile; + + /** + * 创建人 + */ + private String creator; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 请求参数 + */ + private Map params; + + public String getGuid() { + return guid; + } + + public void setGuid(String guid) { + this.guid = guid; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/UserFeedback.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/UserFeedback.java new file mode 100644 index 00000000..85eac74a --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/UserFeedback.java @@ -0,0 +1,127 @@ +package com.zdxt.knowledge.domain; + +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; +import java.util.Date; +import java.util.Map; + +/** + * 用户反馈 user_feedback + * + * @author ruoyi + * @date 2023-01-24 + */ +public class UserFeedback implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String guid; + + /** + * 反馈内容 + */ + private String content; + + /** + * 用户id + */ + private String userId; + + /** + * 昵称 + */ + private String nickname; + + /** + * 用户手机号码 + */ + private String mobile; + + /** + * 城市 + */ + private String city; + + /** + * 创建人 + */ + private String creator; + + /** + * 创建时间 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** + * 请求参数 + */ + private Map params; + + public String getGuid() { + return guid; + } + + public void setGuid(String guid) { + this.guid = guid; + } + + public String getContent() { + return content; + } + + public void setContent(String content) { + this.content = content; + } + + public String getUserId() { + return userId; + } + + public void setUserId(String userId) { + this.userId = userId; + } + + public String getMobile() { + return mobile; + } + + public void setMobile(String mobile) { + this.mobile = mobile; + } + + public String getCity() { + return city; + } + + public void setCity(String city) { + this.city = city; + } + + public String getCreator() { + return creator; + } + + public void setCreator(String creator) { + this.creator = creator; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getNickname() { + return nickname; + } + + public void setNickname(String nickname) { + this.nickname = nickname; + } +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatUser.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatUser.java index 7f0ca7b9..91acd48d 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatUser.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/WechatUser.java @@ -28,6 +28,8 @@ public class WechatUser implements Serializable { private String unionId; + private String medal; + private String creator; private Date createTime; @@ -135,4 +137,12 @@ public class WechatUser implements Serializable { public void setCreateTime(Date createTime) { this.createTime = createTime; } + + public String getMedal() { + return medal; + } + + public void setMedal(String medal) { + this.medal = medal; + } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneMedalMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneMedalMapper.java index e62259f3..59984123 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneMedalMapper.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneMedalMapper.java @@ -27,8 +27,6 @@ public interface SceneMedalMapper { */ public List selectSceneMedalList(SceneMedal sceneMedal); - public List selectSceneMedalListAll(SceneMedal sceneMedal); - /** * 新增 * @@ -53,4 +51,12 @@ public interface SceneMedalMapper { */ public int deleteSceneMedalByIds(String[] guids); + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public List selectSceneMedalByIds(String[] guids); + } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneTextMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneTextMapper.java new file mode 100644 index 00000000..07bfba3c --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneTextMapper.java @@ -0,0 +1,54 @@ +package com.zdxt.knowledge.mapper; + +import com.zdxt.knowledge.domain.SceneText; + +import java.util.List; + +/** + * Mapper接口 + * + * @author ruoyi + * @date 2023-12-26 + */ +public interface SceneTextMapper { + /** + * 查询 + * + * @param guid ID + * @return + */ + public SceneText selectSceneTextById(String guid); + + /** + * 查询列表 + * + * @param SceneText + * @return 集合 + */ + public List selectSceneTextList(SceneText SceneText); + + /** + * 新增 + * + * @param SceneText + * @return 结果 + */ + public int insertSceneText(SceneText SceneText); + + /** + * 修改 + * + * @param SceneText + * @return 结果 + */ + public int updateSceneText(SceneText SceneText); + + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteSceneTextByIds(String[] guids); + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/UserAddressMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/UserAddressMapper.java new file mode 100644 index 00000000..37d72478 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/UserAddressMapper.java @@ -0,0 +1,54 @@ +package com.zdxt.knowledge.mapper; + +import com.zdxt.knowledge.domain.UserAddress; + +import java.util.List; + +/** + * Mapper接口 + * + * @author ruoyi + * @date 2023-12-26 + */ +public interface UserAddressMapper { + /** + * 查询 + * + * @param guid ID + * @return + */ + public UserAddress selectUserAddressById(String guid); + + /** + * 查询列表 + * + * @param userAddress + * @return 集合 + */ + public List selectUserAddressList(UserAddress userAddress); + + /** + * 新增 + * + * @param userAddress + * @return 结果 + */ + public int insertUserAddress(UserAddress userAddress); + + /** + * 修改 + * + * @param userAddress + * @return 结果 + */ + public int updateUserAddress(UserAddress userAddress); + + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserAddressByIds(String[] guids); + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/UserFeedbackMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/UserFeedbackMapper.java new file mode 100644 index 00000000..3c4d11b1 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/UserFeedbackMapper.java @@ -0,0 +1,54 @@ +package com.zdxt.knowledge.mapper; + +import com.zdxt.knowledge.domain.UserFeedback; + +import java.util.List; + +/** + * Mapper接口 + * + * @author ruoyi + * @date 2023-12-26 + */ +public interface UserFeedbackMapper { + /** + * 查询 + * + * @param guid ID + * @return + */ + public UserFeedback selectUserFeedbackById(String guid); + + /** + * 查询列表 + * + * @param userFeedback + * @return 集合 + */ + public List selectUserFeedbackList(UserFeedback userFeedback); + + /** + * 新增 + * + * @param userFeedback + * @return 结果 + */ + public int insertUserFeedback(UserFeedback userFeedback); + + /** + * 修改 + * + * @param userFeedback + * @return 结果 + */ + public int updateUserFeedback(UserFeedback userFeedback); + + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserFeedbackByIds(String[] guids); + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/WechatLoginMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/WechatLoginMapper.java index f556798f..12dd1267 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/WechatLoginMapper.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/WechatLoginMapper.java @@ -20,4 +20,5 @@ public interface WechatLoginMapper { public int updateByOpenId(WechatUser wechatUser); + public WechatUser selectUserById(String guid); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java index 9fa96f90..fd2f7a11 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneMedalService.java @@ -29,8 +29,6 @@ public interface ISceneMedalService { */ public List selectSceneMedalList(SceneMedal sceneMedal); - public List selectSceneMedalListAll(SceneMedal sceneMedal); - /** * 新增 * diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneTextService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneTextService.java new file mode 100644 index 00000000..252c3a71 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneTextService.java @@ -0,0 +1,53 @@ +package com.zdxt.knowledge.service; + +import com.zdxt.knowledge.domain.SceneText; + +import java.util.List; + +/** + * Service接口 + * + * @author ruoyi + * @date 2023-12-26 + */ +public interface ISceneTextService { + /** + * 查询 + * + * @param guid ID + * @return + */ + public SceneText selectSceneTextById(String guid); + + /** + * 查询列表 + * + * @param sceneText + * @return 集合 + */ + public List selectSceneTextList(SceneText sceneText); + + /** + * 新增 + * + * @param sceneText + * @return 结果 + */ + public int insertSceneText(SceneText sceneText); + + /** + * 修改 + * + * @param sceneText + * @return 结果 + */ + public int updateSceneText(SceneText sceneText); + + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteSceneTextByIds(String guids); +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IUserAddressService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IUserAddressService.java new file mode 100644 index 00000000..2920a491 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IUserAddressService.java @@ -0,0 +1,54 @@ +package com.zdxt.knowledge.service; + +import com.zdxt.knowledge.domain.UserAddress; + +import java.util.List; + +/** + * Service接口 + * + * @author ruoyi + * @date 2023-12-26 + */ +public interface IUserAddressService { + /** + * 查询 + * + * @param guid ID + * @return + */ + public UserAddress selectUserAddressById(String guid); + + /** + * 查询列表 + * + * @param userAddress + * @return 集合 + */ + public List selectUserAddressList(UserAddress userAddress); + + + /** + * 新增 + * + * @param userAddress + * @return 结果 + */ + public int insertUserAddress(UserAddress userAddress); + + /** + * 修改 + * + * @param userAddress + * @return 结果 + */ + public int updateUserAddress(UserAddress userAddress); + + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserAddressByIds(String guids); +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IUserFeedbackService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IUserFeedbackService.java new file mode 100644 index 00000000..57e8077a --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/IUserFeedbackService.java @@ -0,0 +1,45 @@ +package com.zdxt.knowledge.service; + +import com.zdxt.knowledge.domain.UserFeedback; + +import java.util.List; + +/** + * Service接口 + * + * @author ruoyi + * @date 2023-12-26 + */ +public interface IUserFeedbackService { + /** + * 查询 + * + * @param guid ID + * @return + */ + public UserFeedback selectUserFeedbackById(String guid); + + /** + * 查询列表 + * + * @param userFeedback + * @return 集合 + */ + public List selectUserFeedbackList(UserFeedback userFeedback); + + /** + * 新增 + * + * @param userFeedback + * @return 结果 + */ + public int insertUserFeedback(UserFeedback userFeedback); + + /** + * 批量删除 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + public int deleteUserFeedbackByIds(String guids); +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/WechatService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/WechatService.java index c361d73a..9a9fafcc 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/WechatService.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/WechatService.java @@ -1,5 +1,6 @@ package com.zdxt.knowledge.service; +import com.zdxt.common.ZDResponse; import com.zdxt.knowledge.domain.WechatLoginRequest; import com.zdxt.knowledge.domain.WechatUser; @@ -16,6 +17,10 @@ public interface WechatService { public List selectList(WechatUser wechatUser); + public WechatUser selectUserById(String guid); + + public int update(WechatUser wechatUser); + /** * 登陆 * @@ -24,4 +29,5 @@ public interface WechatService { */ Map getUserInfoMap(WechatLoginRequest loginRequest) throws Exception; + ZDResponse showMyMedal(WechatUser wechatUser); } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java index a576adc5..4d791e96 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMedalServiceImpl.java @@ -63,11 +63,6 @@ public class SceneMedalServiceImpl implements ISceneMedalService { return sceneMedalMapper.selectSceneMedalList(sceneMedal); } - @Override - public List selectSceneMedalListAll(SceneMedal sceneMedal) { - return sceneMedalMapper.selectSceneMedalListAll(sceneMedal); - } - /** * 新增 * @@ -76,20 +71,21 @@ public class SceneMedalServiceImpl implements ISceneMedalService { */ @Override public int insertSceneMedal(MultipartFile[] files, SceneMedal sceneMedal) { + if (ObjectUtil.isEmpty(files) || files.length > 1) { + return -1; + } UserBean userBean = userApi.getCurrentUser(); if (Objects.nonNull(userBean)) { sceneMedal.setCreator(userBean.getUserName()); sceneMedal.setCreateTime(DateUtils.getNowDate()); } - sceneMedal.setGuid(StringUtils.getUUID()); - int result = sceneMedalMapper.insertSceneMedal(sceneMedal); // 上传文件，并在附件表中添加记录 - if (result > 0 && ObjectUtil.isNotEmpty(files)) { - for (MultipartFile file : files) { - zdxtFileCommonApi.insertZdxtFile(file, sceneMedal.getGuid() + "", fileUploadApi.upload(file)); - } - } - return result; + sceneMedal.setGuid(StringUtils.getUUID()); + String uploadFilePath = fileUploadApi.upload(files[0]); + zdxtFileCommonApi.insertZdxtFile(files[0], sceneMedal.getGuid() + "", uploadFilePath); + //插入数据 + sceneMedal.setIconPath(uploadFilePath); + return sceneMedalMapper.insertSceneMedal(sceneMedal); } /** @@ -100,15 +96,16 @@ public class SceneMedalServiceImpl implements ISceneMedalService { */ @Override public int updateSceneMedal(MultipartFile[] files, SceneMedal sceneMedal) { - int result = sceneMedalMapper.updateSceneMedal(sceneMedal); - // 上传文件，并在附件表中添加记录 - if (result > 0 && ObjectUtil.isNotEmpty(files)) { - zdxtFileCommonApi.deleteZdxtFileByIds(sceneMedal.getGuid()); - for (MultipartFile file : files) { - zdxtFileCommonApi.insertZdxtFile(file, sceneMedal.getGuid() + "", fileUploadApi.upload(file)); - } + if (ObjectUtil.isEmpty(files) || files.length > 1) { + return -1; } - return result; + zdxtFileCommonApi.deleteZdxtFileByIds(sceneMedal.getGuid()); + // 上传文件，并在附件表中添加记录 + String uploadFilePath = fileUploadApi.upload(files[0]); + zdxtFileCommonApi.insertZdxtFile(files[0], sceneMedal.getGuid() + "", uploadFilePath); + //更新数据 + sceneMedal.setIconPath(uploadFilePath); + return sceneMedalMapper.updateSceneMedal(sceneMedal); } /** diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneTextServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneTextServiceImpl.java new file mode 100644 index 00000000..6a022163 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneTextServiceImpl.java @@ -0,0 +1,92 @@ +package com.zdxt.knowledge.service.impl; + +import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.UserApi; +import com.zdxt.common.util.Convert; +import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; +import com.zdxt.knowledge.domain.SceneText; +import com.zdxt.knowledge.mapper.SceneTextMapper; +import com.zdxt.knowledge.service.ISceneTextService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; + +/** + * Service业务层处理 + * + * @author ruoyi + * @date 2023-12-26 + */ +@Service +public class SceneTextServiceImpl implements ISceneTextService { + @Autowired + private SceneTextMapper sceneTextMapper; + @Autowired + private UserApi userApi; + + /** + * 查询 + * + * @param guid ID + * @return + */ + @Override + public SceneText selectSceneTextById(String guid) { + return sceneTextMapper.selectSceneTextById(guid); + } + + /** + * 查询列表 + * + * @param sceneText + * @return + */ + @Override + public List selectSceneTextList(SceneText sceneText) { + return sceneTextMapper.selectSceneTextList(sceneText); + } + + + /** + * 新增 + * + * @param sceneText + * @return 结果 + */ + @Override + public int insertSceneText(SceneText sceneText) { + UserBean userBean = userApi.getCurrentUser(); + if (Objects.nonNull(userBean)) { + sceneText.setCreator(userBean.getUserName()); + sceneText.setCreateTime(DateUtils.getNowDate()); + } + sceneText.setGuid(StringUtils.getUUID()); + return sceneTextMapper.insertSceneText(sceneText); + } + + /** + * 修改 + * + * @param sceneText + * @return 结果 + */ + @Override + public int updateSceneText(SceneText sceneText) { + return sceneTextMapper.updateSceneText(sceneText); + } + + /** + * 删除对象 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteSceneTextByIds(String guids) { + return sceneTextMapper.deleteSceneTextByIds(Convert.toStrArray(guids)); + } + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserAddressServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserAddressServiceImpl.java new file mode 100644 index 00000000..f69636d8 --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserAddressServiceImpl.java @@ -0,0 +1,92 @@ +package com.zdxt.knowledge.service.impl; + +import com.zdxt.auth.dto.UserBean; +import com.zdxt.auth.feign.UserApi; +import com.zdxt.common.util.Convert; +import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; +import com.zdxt.knowledge.domain.UserAddress; +import com.zdxt.knowledge.mapper.UserAddressMapper; +import com.zdxt.knowledge.service.IUserAddressService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; +import java.util.Objects; + +/** + * Service业务层处理 + * + * @author ruoyi + * @date 2023-12-26 + */ +@Service +public class UserAddressServiceImpl implements IUserAddressService { + @Autowired + private UserAddressMapper userAddressMapper; + @Autowired + private UserApi userApi; + + /** + * 查询 + * + * @param guid ID + * @return + */ + @Override + public UserAddress selectUserAddressById(String guid) { + return userAddressMapper.selectUserAddressById(guid); + } + + /** + * 查询列表 + * + * @param userAddress + * @return + */ + @Override + public List selectUserAddressList(UserAddress userAddress) { + return userAddressMapper.selectUserAddressList(userAddress); + } + + /** + * 新增 + * + * @param userAddress + * @return 结果 + */ + @Override + public int insertUserAddress(UserAddress userAddress) { + UserBean userBean = userApi.getCurrentUser(); + if (Objects.nonNull(userBean)) { + userAddress.setCreator(userBean.getUserName()); + userAddress.setCreateTime(DateUtils.getNowDate()); + } + userAddress.setGuid(StringUtils.getUUID()); + return userAddressMapper.insertUserAddress(userAddress); + } + + /** + * 修改 + * + * @param userAddress + * @return 结果 + */ + @Override + public int updateUserAddress(UserAddress userAddress) { + int result = userAddressMapper.updateUserAddress(userAddress); + return result; + } + + /** + * 删除对象 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteUserAddressByIds(String guids) { + return userAddressMapper.deleteUserAddressByIds(Convert.toStrArray(guids)); + } + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserFeedbackServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserFeedbackServiceImpl.java new file mode 100644 index 00000000..66ff61ee --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/UserFeedbackServiceImpl.java @@ -0,0 +1,72 @@ +package com.zdxt.knowledge.service.impl; + +import com.zdxt.common.util.Convert; +import com.zdxt.common.util.DateUtils; +import com.zdxt.common.util.StringUtils; +import com.zdxt.knowledge.domain.UserFeedback; +import com.zdxt.knowledge.mapper.UserFeedbackMapper; +import com.zdxt.knowledge.service.IUserFeedbackService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Service业务层处理 + * + * @author ruoyi + * @date 2023-12-26 + */ +@Service +public class UserFeedbackServiceImpl implements IUserFeedbackService { + @Autowired + private UserFeedbackMapper userFeedbackMapper; + + /** + * 查询 + * + * @param guid ID + * @return + */ + @Override + public UserFeedback selectUserFeedbackById(String guid) { + return userFeedbackMapper.selectUserFeedbackById(guid); + } + + /** + * 查询列表 + * + * @param userFeedback + * @return + */ + @Override + public List selectUserFeedbackList(UserFeedback userFeedback) { + return userFeedbackMapper.selectUserFeedbackList(userFeedback); + } + + /** + * 新增 + * + * @param userFeedback + * @return 结果 + */ + @Override + public int insertUserFeedback(UserFeedback userFeedback) { + userFeedback.setCreator(userFeedback.getNickname()); + userFeedback.setGuid(StringUtils.getUUID()); + userFeedback.setCreateTime(DateUtils.getNowDate()); + return userFeedbackMapper.insertUserFeedback(userFeedback); + } + + /** + * 删除对象 + * + * @param guids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteUserFeedbackByIds(String guids) { + return userFeedbackMapper.deleteUserFeedbackByIds(Convert.toStrArray(guids)); + } + +} diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java index 9961707c..8a7d37dc 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/WechatServiceImpl.java @@ -1,14 +1,16 @@ package com.zdxt.knowledge.service.impl; import cn.hutool.core.lang.Assert; -import cn.hutool.core.util.StrUtil; -import cn.hutool.http.HttpRequest; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.zdxt.common.ZDResponse; +import com.zdxt.common.util.Convert; import com.zdxt.common.util.StringUtils; import com.zdxt.knowledge.domain.RawDataDO; +import com.zdxt.knowledge.domain.SceneMedal; import com.zdxt.knowledge.domain.WechatLoginRequest; import com.zdxt.knowledge.domain.WechatUser; +import com.zdxt.knowledge.mapper.SceneMedalMapper; import com.zdxt.knowledge.mapper.WechatLoginMapper; import com.zdxt.knowledge.service.WechatService; import com.zdxt.knowledge.utils.HttpClientUtils; @@ -23,10 +25,7 @@ import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import java.security.AlgorithmParameters; import java.security.Security; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Service业务层处理 @@ -41,6 +40,9 @@ public class WechatServiceImpl implements WechatService { @Autowired private WechatLoginMapper wechatLoginMapper; + @Autowired + private SceneMedalMapper sceneMedalMapper; + private static final String REQUEST_URL = "https://api.weixin.qq.com/sns/jscode2session"; private static final String APPID = "wx93ec514a5c456507"; private static final String SECRET = "f5a3f295dbee3cc1c2f73b9a324c2eb2"; @@ -52,6 +54,16 @@ public class WechatServiceImpl implements WechatService { return wechatLoginMapper.selectList(wechatUser); } + @Override + public WechatUser selectUserById(String guid) { + return wechatLoginMapper.selectUserById(guid); + } + + @Override + public int update(WechatUser wechatUser) { + return wechatLoginMapper.updateByOpenId(wechatUser); + } + @Override public Map getUserInfoMap(WechatLoginRequest loginRequest) throws Exception { Map userInfoMap = new HashMap<>(); @@ -86,18 +98,28 @@ public class WechatServiceImpl implements WechatService { // } insertOrUpdateDO.setGuid(StringUtils.getUUID()); insertOrUpdateDO.setCreator("SYSTEM"); - insertOrUpdateDO.setToken(getToken(insertOrUpdateDO.getGuid(),insertOrUpdateDO.getNickname())); + insertOrUpdateDO.setToken(getToken(insertOrUpdateDO.getGuid(), insertOrUpdateDO.getNickname())); wechatLoginMapper.insertUser(insertOrUpdateDO); userInfoMap.put("token", insertOrUpdateDO.getToken()); } else { userInfoMap.put("token", user.getToken()); // 已存在，做已存在的处理，如更新用户的头像，昵称等，根据openID更新 - wechatLoginMapper.updateByOpenId(insertOrUpdateDO); + //wechatLoginMapper.updateByOpenId(insertOrUpdateDO); } return userInfoMap; } + @Override + public ZDResponse showMyMedal(WechatUser wechatUser) { + WechatUser user = wechatLoginMapper.getByOpenId(wechatUser.getOpenId()); + if (Objects.nonNull(user.getMedal())) { + List sceneMedals = sceneMedalMapper.selectSceneMedalByIds(Convert.toStrArray(user.getMedal())); + return ZDResponse.success("成功", sceneMedals); + } + return ZDResponse.success("成功", Collections.singleton(new SceneMedal())); + } + private JSONObject getSessionKeyOrOpenId(String code) throws Exception { // String apiUrl = StrUtil.format("https://api.weixin.qq.com/sns/jscode2session?appid={}&secret={}&js_code={}&grant_type=authorization_code", APPID, SECRET, code); @@ -188,8 +210,8 @@ public class WechatServiceImpl implements WechatService { private String getToken(String guid, String nickname) throws Exception { // 写入用户信息 HashMap tokenMap = new HashMap<>(); - tokenMap.put("userName",nickname); - tokenMap.put("id",guid); + tokenMap.put("userName", nickname); + tokenMap.put("id", guid); // 生成token //String token = JWTUtil.createToken(tokenMap,tokenKey.getBytes()); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml index fa8804a2..f20f2c56 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMedalMapper.xml @@ -7,7 +7,7 @@ - + @@ -18,7 +18,7 @@ select guid, name, icon_path, - earn_icon_path, + hide, creator, create_time, update_by, @@ -29,6 +29,7 @@ - select cu.guid, cu.name, zd.upload_path - from scene_medal as cu - inner join zdxt_file as zd - on cu.guid = zd.business_id - where cu.hide = 1 - order by cu.sort ASC + + + + + + + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneTabMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneTabMapper.xml index ef1da36c..846f25a4 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneTabMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneTabMapper.xml @@ -65,7 +65,7 @@ creator, create_time, update_by, - create_time, + updateTime, #{guid}, diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneTextMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneTextMapper.xml new file mode 100644 index 00000000..3cbd73ed --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneTextMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + select guid, + content, + type, + creator, + create_time, + update_by, + update_time + from scene_text + + + + + + + + insert into scene_text + + guid, + `content`, + `type`, + creator, + create_time, + update_by, + updateTime, + + + #{guid}, + #{content}, + #{type}, + #{creator}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update scene_text + + content = #{content}, + `type` = #{type}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where guid = #{guid} + + + + delete + from scene_text + where guid = #{guid} + + + + delete from scene_text where guid in + + #{guid} + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserAddressMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserAddressMapper.xml new file mode 100644 index 00000000..aab2423b --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserAddressMapper.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + select guid, + user_id, + name, + address, + mobile, + creator, + create_time + from user_address + + + + + + + + insert into user_address + + guid, + `user_id`, + `name`, + `address`, + `mobile`, + creator, + create_time, + + + #{guid}, + #{userId}, + #{name}, + #{address}, + #{mobile}, + #{creator}, + #{createTime}, + + + + + update user_address + + address = #{address}, + `name` = #{name}, + mobile = #{mobile}, + + where guid = #{guid} + + + + delete + from user_address + where guid = #{guid} + + + + delete from user_address where guid in + + #{guid} + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserFeedbackMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserFeedbackMapper.xml new file mode 100644 index 00000000..a5172e6c --- /dev/null +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/UserFeedbackMapper.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + select guid, + content, + user_id, + nickname, + city, + mobile, + creator, + create_time + from user_feedback + + + + + + + + insert into user_feedback + + guid, + `content`, + `user_id`, + `nickname`, + `city`, + `mobile`, + creator, + create_time, + + + #{guid}, + #{content}, + #{userId}, + #{nickname}, + #{city}, + #{mobile}, + #{creator}, + #{createTime}, + + + + + delete from user_feedback where guid in + + #{guid} + + + + \ No newline at end of file diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml index 92595090..e48aeae7 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml @@ -15,6 +15,7 @@ + @@ -32,7 +33,8 @@ creator, create_time, open_id, - union_id + union_id, + medal from wechat_user @@ -50,6 +52,11 @@ where open_id = #{openId} + + insert into wechat_user @@ -97,6 +104,7 @@ `mobile` = #{mobile}, open_id = #{openId}, union_id = #{unionId}, + medal = #{medal}, where guid = #{guid}