diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html index 32b48397..00c03420 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html @@ -22,6 +22,21 @@ +
+ +
+ +
+
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html index 75293e0d..d97443c6 100755 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html @@ -14,6 +14,22 @@
+
+ +
+ +
+
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/add.html index 646eebee..f184b1f3 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/add.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/add.html @@ -2,6 +2,7 @@ +
@@ -17,14 +18,16 @@
- +
- + +
+ \ 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 index 87c587f0..07442515 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/edit.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/edit.html @@ -2,10 +2,11 @@ +
-
+
@@ -18,25 +19,81 @@
- +
- + +
+ \ 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 index fe37a7c9..47d1e5c1 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/text/view.html @@ -54,10 +54,6 @@ columns: [{ checkbox: true }, - { - field: 'content', - title: '配置内容' - }, { field: 'type', title: '配置类型', @@ -73,6 +69,10 @@ } } }, + { + field: 'content', + title: '配置内容' + }, { field: 'creator', title: '创建人' @@ -87,6 +87,7 @@ formatter: function (value, row, index) { var actions = []; actions.push('编辑 '); + actions.push(' 删除'); return actions.join(''); } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneHome.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneHome.java index 8fc1fda5..fe50bcfb 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneHome.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneHome.java @@ -35,6 +35,11 @@ public class SceneHome implements Serializable { */ private String picIcon; + /** + * 图标 + */ + private String pagePath; + /** * 名称 */ @@ -128,4 +133,12 @@ public class SceneHome implements Serializable { public void setUploadPath(String uploadPath) { this.uploadPath = uploadPath; } + + public String getPagePath() { + return pagePath; + } + + public void setPagePath(String pagePath) { + this.pagePath = pagePath; + } } 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 8a7d37dc..873770da 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 @@ -100,9 +100,9 @@ public class WechatServiceImpl implements WechatService { insertOrUpdateDO.setCreator("SYSTEM"); insertOrUpdateDO.setToken(getToken(insertOrUpdateDO.getGuid(), insertOrUpdateDO.getNickname())); wechatLoginMapper.insertUser(insertOrUpdateDO); - userInfoMap.put("token", insertOrUpdateDO.getToken()); + userInfoMap.put("token", openId); } else { - userInfoMap.put("token", user.getToken()); + userInfoMap.put("token", openId); // 已存在，做已存在的处理，如更新用户的头像，昵称等，根据openID更新 //wechatLoginMapper.updateByOpenId(insertOrUpdateDO); } @@ -122,9 +122,6 @@ public class WechatServiceImpl implements WechatService { 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); -// String body = HttpRequest.get(apiUrl).execute().body(); - Map requestUrlParam = new HashMap<>(); // 小程序appId requestUrlParam.put("appid", APPID); @@ -215,6 +212,6 @@ public class WechatServiceImpl implements WechatService { // 生成token //String token = JWTUtil.createToken(tokenMap,tokenKey.getBytes()); - return StringUtils.getUUID(); + return ""; } } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneHomeMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneHomeMapper.xml index 1f5ecc2f..a91eb5da 100644 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneHomeMapper.xml +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneHomeMapper.xml @@ -9,13 +9,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select guid, name, sort, hide, pic_icon, creator, create_time from scene_home + select guid, name, sort, hide, pic_icon, page_path, creator, create_time from scene_home - and `type` like concat('%', #{type}, '%') + and `type` = #{type} and creator = #{creator} order by create_time desc @@ -43,7 +43,7 @@ guid, `content`, - `type`, + `type`, creator, create_time, update_by, @@ -52,7 +52,7 @@ #{guid}, #{content}, - #{type}, + #{type}, #{creator}, #{createTime}, #{updateBy},