diff --git a/skyeye-common/src/main/java/com/skyeye/common/constans/Constants.java b/skyeye-common/src/main/java/com/skyeye/common/constans/Constants.java index 4a85bc2878ca2292f0bf50c423ffac9655305368..6bd5e84c60346e12e5f4de62e5771ae7026ec8b0 100644 --- a/skyeye-common/src/main/java/com/skyeye/common/constans/Constants.java +++ b/skyeye-common/src/main/java/com/skyeye/common/constans/Constants.java @@ -90,5 +90,13 @@ public class Constants { public static final String REDIS_CODEMODEL_EXPLAIN_EXEXPLAINTOCODEMODEL = "exexplaintocodemodel";//代码生成器模板规范说明key public static final String REDIS_CODEMODEL_EXPLAIN_EXEXPLAINTODSFORMCONTENT = "exexplaintodsformcontent";//动态表单内容项模板规范说明key + /** + * 微信小程序页面id的序列号 + */ + public static final String REDIS_PROJECT_PAGE_FILE_PATH = "projectpagefilepath";//页面路径的序列号key + public static final String REDIS_PROJECT_PAGE_FILE_NAME = "projectpagefilename";//页面名称的序列号key + public static final String REDIS_PROJECT_PAGE_FILE_PATH_NUM = "1000";//页面路径的序列号默认值 + public static final String REDIS_PROJECT_PAGE_FILE_NAME_NUM = "1000";//页面名称的序列号默认值 + } diff --git a/skyeye-dao/src/main/java/com/skyeye/smprogram/dao/SmProjectPageDao.java b/skyeye-dao/src/main/java/com/skyeye/smprogram/dao/SmProjectPageDao.java index 7fdd411c52bfa75fcf5eb37ef246a36c914ee3c0..13b2ad3a2b49b8bebcfdd9b9b644512c5bd8c5b0 100644 --- a/skyeye-dao/src/main/java/com/skyeye/smprogram/dao/SmProjectPageDao.java +++ b/skyeye-dao/src/main/java/com/skyeye/smprogram/dao/SmProjectPageDao.java @@ -7,4 +7,12 @@ public interface SmProjectPageDao { public List> queryProPageMationByProIdList(Map map) throws Exception; + public Map queryFilePathNumMaxMation(Map map) throws Exception; + + public Map queryFileNameNumMaxMation(Map map) throws Exception; + + public Map querySortMaxMationByProjectId(Map map) throws Exception; + + public int insertProPageMationByProId(Map map) throws Exception; + } diff --git a/skyeye-service/src/main/java/com/skyeye/smprogram/service/SmProjectPageService.java b/skyeye-service/src/main/java/com/skyeye/smprogram/service/SmProjectPageService.java index 72b718b6dda169a924cce819a11d3293dcc16564..0cbb23d4930fa615c94e3cecf4e8ec681e187883 100644 --- a/skyeye-service/src/main/java/com/skyeye/smprogram/service/SmProjectPageService.java +++ b/skyeye-service/src/main/java/com/skyeye/smprogram/service/SmProjectPageService.java @@ -7,4 +7,6 @@ public interface SmProjectPageService { public void queryProPageMationByProIdList(InputObject inputObject, OutputObject outputObject) throws Exception; + public void insertProPageMationByProId(InputObject inputObject, OutputObject outputObject) throws Exception; + } diff --git a/skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/SmProjectPageServiceImpl.java b/skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/SmProjectPageServiceImpl.java index 07ecbbb797cb8ee0484fcb90853889cc4df98c35..1f4fe3ee3501f054e69eeae8b67589cd3a086e79 100644 --- a/skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/SmProjectPageServiceImpl.java +++ b/skyeye-service/src/main/java/com/skyeye/smprogram/service/impl/SmProjectPageServiceImpl.java @@ -2,12 +2,13 @@ package com.skyeye.smprogram.service.impl; import java.util.List; import java.util.Map; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - +import com.skyeye.common.constans.Constants; import com.skyeye.common.object.InputObject; import com.skyeye.common.object.OutputObject; +import com.skyeye.common.util.ToolUtil; +import com.skyeye.jedis.JedisClient; import com.skyeye.smprogram.dao.SmProjectPageDao; import com.skyeye.smprogram.service.SmProjectPageService; @@ -17,6 +18,9 @@ public class SmProjectPageServiceImpl implements SmProjectPageService{ @Autowired private SmProjectPageDao smProjectPageDao; + @Autowired + public JedisClient jedisClient; + /** * * @Title: queryProPageMationByProIdList @@ -36,6 +40,69 @@ public class SmProjectPageServiceImpl implements SmProjectPageService{ outputObject.settotal(beans.size()); } } + + /** + * + * @Title: insertProPageMationByProId + * @Description: 添加项目内部的页面 + * @param @param inputObject + * @param @param outputObject + * @param @throws Exception 参数 + * @return void 返回类型 + * @throws + */ + @Override + public void insertProPageMationByProId(InputObject inputObject, OutputObject outputObject) throws Exception { + Map map = inputObject.getParams(); + Map user = inputObject.getLogParams(); + if(!jedisClient.exists(Constants.REDIS_PROJECT_PAGE_FILE_PATH)){//判断redis中是否存在文件路径--不存在 + Map redisFilePathNum = smProjectPageDao.queryFilePathNumMaxMation(map); + if(redisFilePathNum == null){ + jedisClient.set(Constants.REDIS_PROJECT_PAGE_FILE_PATH, Constants.REDIS_PROJECT_PAGE_FILE_PATH_NUM);//如果表中没数据，默认插入这条数据 + }else{ + if(redisFilePathNum.containsKey("redisFilePathNum")){ + jedisClient.set(Constants.REDIS_PROJECT_PAGE_FILE_PATH, redisFilePathNum.get("redisFilePathNum").toString());//如果表中有数据，默认插入这条数据的值 + }else{ + jedisClient.set(Constants.REDIS_PROJECT_PAGE_FILE_PATH, Constants.REDIS_PROJECT_PAGE_FILE_PATH_NUM);//如果表中没数据，默认插入这条数据 + } + } + } + + if(!jedisClient.exists(Constants.REDIS_PROJECT_PAGE_FILE_NAME)){//判断redis中是否存在文件名称--不存在 + Map redisFilePathNum = smProjectPageDao.queryFileNameNumMaxMation(map); + if(redisFilePathNum == null){ + jedisClient.set(Constants.REDIS_PROJECT_PAGE_FILE_NAME, Constants.REDIS_PROJECT_PAGE_FILE_NAME_NUM);//如果表中没数据，默认插入这条数据 + }else{ + if(redisFilePathNum.containsKey("redisFilePathNum")){ + jedisClient.set(Constants.REDIS_PROJECT_PAGE_FILE_NAME, redisFilePathNum.get("redisFileNameNum").toString());//如果表中有数据，默认插入这条数据的值 + }else{ + jedisClient.set(Constants.REDIS_PROJECT_PAGE_FILE_NAME, Constants.REDIS_PROJECT_PAGE_FILE_PATH_NUM);//如果表中没数据，默认插入这条数据 + } + } + } + map.put("defaultFilePath", "page" + jedisClient.get(Constants.REDIS_PROJECT_PAGE_FILE_PATH).toString());//初始化默认文件路径 + map.put("defaultFileName", "page" + jedisClient.get(Constants.REDIS_PROJECT_PAGE_FILE_NAME).toString());//初始化默认文件名称 + map.put("defaultFilePathNum", jedisClient.get(Constants.REDIS_PROJECT_PAGE_FILE_PATH).toString());//初始化默认文件路径序列号 + map.put("defaultFileNameNum", jedisClient.get(Constants.REDIS_PROJECT_PAGE_FILE_NAME).toString());//初始化默认文件名称序列号 + jedisClient.set(Constants.REDIS_PROJECT_PAGE_FILE_PATH, String.valueOf(Integer.parseInt(jedisClient.get(Constants.REDIS_PROJECT_PAGE_FILE_PATH).toString()) + 1)); + jedisClient.set(Constants.REDIS_PROJECT_PAGE_FILE_NAME, String.valueOf(Integer.parseInt(jedisClient.get(Constants.REDIS_PROJECT_PAGE_FILE_NAME).toString()) + 1)); + + //获取当前项目中页面排序序列值最大的一个 + Map sortMax = smProjectPageDao.querySortMaxMationByProjectId(map); + if(sortMax == null){ + map.put("sort", 1); + }else{ + if(sortMax.containsKey("sort")){ + map.put("sort", Integer.parseInt(sortMax.get("sort").toString()) + 1); + }else{ + map.put("sort", 1); + } + } + map.put("id", ToolUtil.getSurFaceId()); + map.put("createId", user.get("id")); + map.put("createTime", ToolUtil.getTimeAndToString()); + smProjectPageDao.insertProPageMationByProId(map); + } diff --git a/skyeye-web/src/main/java/com/skyeye/smprogram/controller/SmProjectPageController.java b/skyeye-web/src/main/java/com/skyeye/smprogram/controller/SmProjectPageController.java index ba34bee47e7d6b05a2ef6f51a76f511bc4e27da1..935621f704fd515fc2f41c76254e311e3ef0a9fd 100644 --- a/skyeye-web/src/main/java/com/skyeye/smprogram/controller/SmProjectPageController.java +++ b/skyeye-web/src/main/java/com/skyeye/smprogram/controller/SmProjectPageController.java @@ -30,4 +30,22 @@ public class SmProjectPageController { public void queryProPageMationByProIdList(InputObject inputObject, OutputObject outputObject) throws Exception{ smProjectPageService.queryProPageMationByProIdList(inputObject, outputObject); } + + /** + * + * @Title: insertProPageMationByProId + * @Description: 添加项目内部的页面 + * @param @param inputObject + * @param @param outputObject + * @param @throws Exception 参数 + * @return void 返回类型 + * @throws + */ + @RequestMapping("/post/SmProjectPageController/insertProPageMationByProId") + @ResponseBody + public void insertProPageMationByProId(InputObject inputObject, OutputObject outputObject) throws Exception{ + smProjectPageService.insertProPageMationByProId(inputObject, outputObject); + } + + } diff --git a/skyeye-web/src/main/resources/dbmapper/SmProjectPageMapper.xml b/skyeye-web/src/main/resources/dbmapper/SmProjectPageMapper.xml index 16ded2202fcc7a66740cf5c2ad63ade213425808..0d2113502fb03bed1a93cd08480280e0f3018ed2 100644 --- a/skyeye-web/src/main/resources/dbmapper/SmProjectPageMapper.xml +++ b/skyeye-web/src/main/resources/dbmapper/SmProjectPageMapper.xml @@ -5,7 +5,9 @@ + + + + + + + + INSERT into sm_project_page + (id, name, file_path, file_name, default_file_path, default_file_name, default_file_path_num, default_file_name_num, sm_project_id, sort, create_id, create_time) + VALUES + (#{id}, #{name}, #{filePath}, #{fileName}, #{defaultFilePath}, #{defaultFileName}, #{defaultFilePathNum}, #{defaultFileNameNum}, #{proId}, #{sort}, #{createId}, #{createTime}) + + \ No newline at end of file diff --git a/skyeye-web/src/main/resources/mapping/reqmapping.xml b/skyeye-web/src/main/resources/mapping/reqmapping.xml index 0cedf55eb5b2c592ba95e44a822b745c578f7577..3b825209fbd13cf2a212c1d603617cbdf3ae2a2f 100644 --- a/skyeye-web/src/main/resources/mapping/reqmapping.xml +++ b/skyeye-web/src/main/resources/mapping/reqmapping.xml @@ -293,6 +293,13 @@ + + + + + + + diff --git a/skyeye-web/src/main/webapp/assets/lib/layui/custom.js b/skyeye-web/src/main/webapp/assets/lib/layui/custom.js index d7718095edeaf6def601162a23c0c3857bff9432..7b392f90477e8241b41b2811fcc2e8d61116ea92 100644 --- a/skyeye-web/src/main/webapp/assets/lib/layui/custom.js +++ b/skyeye-web/src/main/webapp/assets/lib/layui/custom.js @@ -471,7 +471,7 @@ var refreshGrid = function (id, option){ dataGrid_setting[index].settings.pageindex = 1; showGrid.settings = dataGrid_setting[index].settings; showGrid.settings.params = layui.$.extend({}, showGrid.settings.params, option.params); - dataGrid_setting.splice(index, 1); + dataGrid_setting.splice(index, 1, showGrid); return; } }); diff --git a/skyeye-web/src/main/webapp/assets/lib/winui/css/winui.css b/skyeye-web/src/main/webapp/assets/lib/winui/css/winui.css index 907ce04b1e1352e7b6b0622c80c5cd7d6e9c1a9a..251b495d9e09f501c486f50ec5bddb57be2c269a 100644 --- a/skyeye-web/src/main/webapp/assets/lib/winui/css/winui.css +++ b/skyeye-web/src/main/webapp/assets/lib/winui/css/winui.css @@ -2748,6 +2748,12 @@ body .layer-ext-winconfirm { line-height: 25px; background-color: ghostwhite; margin-top: 10px; + background: rgba(0.5,0.3,0.2,0.1) none repeat scroll !important; +} + +.page-li:HOVER{ + cursor: pointer; + border: 1px #357ebd dashed; } .code-model-li{ diff --git a/skyeye-web/src/main/webapp/js/rmmysmpropage/addpagebeanitem.js b/skyeye-web/src/main/webapp/js/rmmysmpropage/addpagebeanitem.js new file mode 100644 index 0000000000000000000000000000000000000000..03933328d0a2ba9aceeca44da160193dc4c1933d --- /dev/null +++ b/skyeye-web/src/main/webapp/js/rmmysmpropage/addpagebeanitem.js @@ -0,0 +1,40 @@ +layui.config({ + base: basePath, + version: skyeyeVersion +}).define(['table', 'jquery', 'winui'], function (exports) { + winui.renderColor(); + layui.use(['form'], function (form) { + var index = parent.layer.getFrameIndex(window.name); //获取窗口索引 + var $ = layui.$, + form = layui.form; + + form.render(); + + form.on('submit(formAddBean)', function (data) { + //表单验证 + if (winui.verifyForm(data.elem)) { + var params = { + name: $("#pageName").val(), + filePath: $("#filePath").val(), + fileName: $("#fileName").val(), + rowId: parent.proId, + }; + + AjaxPostUtil.request({url:reqBasePath + "rmxcx030", params:params, type:'json', callback:function(json){ + if(json.returnCode == 0){ + parent.layer.close(index); + parent.refreshCode = '0'; + }else{ + top.winui.window.msg(json.returnMessage, {icon: 2,time: 2000}); + } + }}); + } + return false; + }); + + //取消 + $("body").on("click", "#cancle", function(){ + parent.layer.close(index); + }); + }); +}); \ No newline at end of file diff --git a/skyeye-web/src/main/webapp/js/rmmysmpropage/mysmpropagelist.js b/skyeye-web/src/main/webapp/js/rmmysmpropage/mysmpropagelist.js index 823c18814947a9887625e286ae04465f965d5410..f87e870a149a22199fb9a459a44438f42fdc0907 100644 --- a/skyeye-web/src/main/webapp/js/rmmysmpropage/mysmpropagelist.js +++ b/skyeye-web/src/main/webapp/js/rmmysmpropage/mysmpropagelist.js @@ -1,4 +1,6 @@ +var proId = ""; + layui.config({ base: basePath, version: skyeyeVersion @@ -10,6 +12,8 @@ layui.config({ form = layui.form, table = layui.table; + proId = parent.rowId;//项目id + $("#groupMemberTab").hide(); //初始化加载该项目的所有页面 showGrid({ @@ -195,9 +199,21 @@ layui.config({ $(this).parent().parent().remove(); }) - function loadTable(){ - table.reload("messageTable", {where:{proName:$("#proName").val()}}); - } + //添加页面按钮 + $('body').on('click', '#addPageBean', function(){ + _openNewWindows({ + url: "../../tpl/rmmysmpropage/addpagebeanitem.html", + title: "新增页面", + pageId: "addpagebeanitem", + callBack: function(refreshCode){ + if (refreshCode == '0') { + refreshGrid("pageList", {params:{rowId: parent.rowId}}); + top.winui.window.msg("操作成功", {icon: 1,time: 2000}); + } else if (refreshCode == '-9999') { + top.winui.window.msg("操作失败", {icon: 2,time: 2000}); + } + }}); + }); exports('mysmpropagelist', {}); }); diff --git a/skyeye-web/src/main/webapp/tpl/rmgroup/rmgroupadd.html b/skyeye-web/src/main/webapp/tpl/rmgroup/rmgroupadd.html index 0e08203a36f6284d467a6e90f0d697a08d34e6d7..fed947415aec0f107ad08222d01e9c96fca1691c 100644 --- a/skyeye-web/src/main/webapp/tpl/rmgroup/rmgroupadd.html +++ b/skyeye-web/src/main/webapp/tpl/rmgroup/rmgroupadd.html @@ -6,8 +6,6 @@ - -
diff --git a/skyeye-web/src/main/webapp/tpl/rmgroup/rmgroupedit.html b/skyeye-web/src/main/webapp/tpl/rmgroup/rmgroupedit.html index 629b11573d4d1e44cce7f210904da984c85300e7..3c12bb3bb143606ecd81c9694302ddb35f899457 100644 --- a/skyeye-web/src/main/webapp/tpl/rmgroup/rmgroupedit.html +++ b/skyeye-web/src/main/webapp/tpl/rmgroup/rmgroupedit.html @@ -6,8 +6,6 @@ - -
diff --git a/skyeye-web/src/main/webapp/tpl/rmmysmpropage/addpagebeanitem.html b/skyeye-web/src/main/webapp/tpl/rmmysmpropage/addpagebeanitem.html new file mode 100644 index 0000000000000000000000000000000000000000..ad7a7e5e798e6a4c117dc2ac0fad6c72c0e4aea4 --- /dev/null +++ b/skyeye-web/src/main/webapp/tpl/rmmysmpropage/addpagebeanitem.html @@ -0,0 +1,45 @@ + + + + + + + + + + +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ + +
+
+
+
+ + + + + \ No newline at end of file diff --git a/skyeye-web/src/main/webapp/tpl/rmmysmpropage/mysmpropagelist.html b/skyeye-web/src/main/webapp/tpl/rmmysmpropage/mysmpropagelist.html index 17ddbd34923ef2a56118311606e499829cd40760..b2578248df32ea7a711dfa4b7606f6c168ad6297 100644 --- a/skyeye-web/src/main/webapp/tpl/rmmysmpropage/mysmpropagelist.html +++ b/skyeye-web/src/main/webapp/tpl/rmmysmpropage/mysmpropagelist.html @@ -11,7 +11,7 @@
- +
@@ -24,7 +24,7 @@
-
    +
diff --git a/skyeye-web/src/main/webapp/tpl/rmmysmpropage/pageTemplate.tpl b/skyeye-web/src/main/webapp/tpl/rmmysmpropage/pageTemplate.tpl index 92ce9ade7a0a0db0bf939a0cebe4cd9c61e25311..4143b43b852a92035e6ff92a82ad1f996d2b66bb 100644 --- a/skyeye-web/src/main/webapp/tpl/rmmysmpropage/pageTemplate.tpl +++ b/skyeye-web/src/main/webapp/tpl/rmmysmpropage/pageTemplate.tpl @@ -4,11 +4,11 @@ {{name}}
- - - - - + + + + +
{{/each}} \ No newline at end of file