diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseMenuController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseMenuController.java index f4bbdb381..4daad73b1 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseMenuController.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/BaseMenuController.java @@ -37,7 +37,7 @@ import java.util.Map; public class BaseMenuController { @Autowired private IBaseMenuService baseMenuService; - + /** * 分页列表查询 * @return @@ -71,7 +71,7 @@ public class BaseMenuController { baseMenuService.saveBaseMenu(baseMenu); return Result.ok(); } - + /** * 编辑 * @param baseMenu @@ -83,7 +83,7 @@ public class BaseMenuController { baseMenuService.editBaseMenu(baseMenu); return Result.ok(); } - + /** * 通过id删除 * @param @@ -103,12 +103,11 @@ public class BaseMenuController { result.successMsg(MessageUtil.get("deleteSucess")); } } - - return result; - } - - + return result; + } + + /** * 通过id查询 * @param @@ -149,8 +148,9 @@ public class BaseMenuController { @ApiOperation(value = "查询项目默认的菜单列表并根据模块分组", notes = "查询项目默认的菜单列表并根据模块分组", httpMethod="POST") @ApiImplicitParams({ - @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), - }) + @ApiImplicitParam(name = "projectSn", value = "项目sn", paramType = "query", required = true, dataType = "String"), + @ApiImplicitParam(name = "moduleTypes", value = "模块类型（多个用逗号分割）：1企业模块，2项目后台模块，3企业后台，4项目看板", paramType = "query", required = false, dataType = "String"), + }) @PostMapping(value = "/getProjectModuleGroupMenuList") public Result> getProjectModuleGroupMenuList(@RequestBody Map map) { return Result.success(baseMenuService.getProjectModuleGroupMenuList(map)); diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml index 4bd882bc7..09ce883de 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml @@ -15,6 +15,12 @@ SELECT a.* from base_module a INNER JOIN base_module_project b ON (a.module_id=b.module_id and b.type=2) WHERE b.type=2 AND b.sn=#{projectSn} and a.style_type=#{styleType} + + AND a.module_type in + + #{item} + + ORDER BY a.module_type,a.label_sort_num,a.label_name,a.module_id - \ No newline at end of file + diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java index 3143847ba..486ab45a6 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/BaseMenuServiceImpl.java @@ -16,6 +16,7 @@ import com.zhgd.xmgl.modules.basicdata.service.IBaseMenuService; import com.zhgd.xmgl.util.ListUtils; import com.zhgd.xmgl.util.MessageUtil; import org.apache.commons.collections.MapUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -89,16 +90,21 @@ public class BaseMenuServiceImpl extends ServiceImpl i @Override public List getProjectModuleGroupMenuList(Map map) { - map.put("styleType",getStyleType(MapUtils.getString(map,"projectSn"))); - List menuList=baseMenuMapper.getProjectBaseMenuList(map); - List actionList=baseActionMapper.getProjectBaseActionList(map); - menuList=groupMenu(menuList,actionList); - List moduleList=baseModuleMapper.getProjectModuleList(map); - if(menuList!=null&&menuList.size()>0){ - for (BaseModule module:moduleList){ - List tempList=new ArrayList<>(); - for (EntityMap menu:menuList){ - if(MapUtils.getString(menu,"moduleId").equals(String.valueOf(module.getModuleId()))){ + String moduleTypes = MapUtils.getString(map, "moduleTypes"); + if (StringUtils.isNotBlank(moduleTypes)) { + String[] split = StringUtils.split(moduleTypes, ","); + map.put("moduleTypeArr", split); + } + map.put("styleType", getStyleType(MapUtils.getString(map, "projectSn"))); + List menuList = baseMenuMapper.getProjectBaseMenuList(map); + List actionList = baseActionMapper.getProjectBaseActionList(map); + menuList = groupMenu(menuList, actionList); + List moduleList = baseModuleMapper.getProjectModuleList(map); + if (menuList != null && menuList.size() > 0) { + for (BaseModule module : moduleList) { + List tempList = new ArrayList<>(); + for (EntityMap menu : menuList) { + if (MapUtils.getString(menu, "moduleId").equals(String.valueOf(module.getModuleId()))) { tempList.add(menu); } } diff --git a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProgressPanoramaNodePlan.java b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProgressPanoramaNodePlan.java index 51adf11f9..883855367 100644 --- a/src/main/java/com/zhgd/xmgl/modules/project/entity/ProgressPanoramaNodePlan.java +++ b/src/main/java/com/zhgd/xmgl/modules/project/entity/ProgressPanoramaNodePlan.java @@ -149,4 +149,11 @@ public class ProgressPanoramaNodePlan implements Serializable { @Excel(name = "成果物明细", width = 15) @ApiModelProperty(value = "成果物明细") private String deliverable; + /** + * 城润标段名称 + */ + @Excel(name = "城润标段名称", width = 15) + @ApiModelProperty(value = "城润标段名称") + private String crSectionName; + } diff --git a/src/main/resources/application-cj-gsx.properties b/src/main/resources/application-cj-gsx.properties new file mode 100644 index 000000000..05189d9c5 --- /dev/null +++ b/src/main/resources/application-cj-gsx.properties @@ -0,0 +1,97 @@ +#http.port=30250 +http.port=21239 +#spring.datasource.url=jdbc:mysql://124.71.178.44:3306/wisdomsite_lgdc?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +#spring.datasource.url=jdbc:mysql://183.60.227.61:20246/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&serverTimezone=UTC +#spring.datasource.url=jdbc:mysql://36.137.53.203:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +#spring.datasource.url=jdbc:mysql://139.9.66.234:3386/wisdomsite_ty?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +#spring.datasource.url=jdbc:mysql://182.90.224.237:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +#spring.datasource.url=jdbc:mysql://139.9.66.234:3306/wisdomsite?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true +spring.datasource.url=jdbc:mysql://192.168.34.221:3306/wisdomsite_temp?useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false +spring.datasource.username=ENC(XR4C/hvTYCUqudS49Wh/jA==) +#spring.datasource.password=ENC(hHkiHEc6vSWjqfOtg2/2Uiihs0vX3l7V) +spring.datasource.password=ENC(LsKaVL2ycDu+uUNoPndYLA==) +server.port=30001 +#server.port=30246 +basePath=C:/jxj/prod/backEnd/itbgpImage/ +server.tomcat.basedir=C:/jxj/prod/backEnd/tempImage/ +#arcsoft.dllPath=D:/hz/wisdomSite/src/main/resources/dll +#basePath=F:/zhgd/itbgpImage/ +#server.tomcat.basedir=F:/zhgd/tempImage/ +#arcsoft.dllPath=F:/zhgd/dll +arcsoft.dllPath=C:/jxj/prod/backEnd/dll +security.enable=false +isGetStandardData=false +isGetEnvironmentData=false +isGetFaceFeatureDate=false +#\u6D77\u5EB7\u89C6\u9891\u62A5\u8B66\u56FE\u7247IP\u7AEF\u53E3\u66FF\u6362 +video.alarm.newUrl=223.82.100.80:6040 +wx-appid= +wx-AppSecret= +mqtt-scope=zjsjTopic +serverUrl=http://124.71.67.160:8088/ +#serverUrl=http://182.90.224.237:7000 +#serverUrl=http://127.0.0.1:6023 +#\u89C6\u9891\u5206\u6790url +video-analysis-url= +server.ssl.enabled=false +#\u9ED8\u8BA4\u653F\u52A1\u521B\u5EFA\u9879\u76EE\u6240\u5C5E\u4F01\u4E1A +defaultZwComapnySn= +#\u6587\u4EF6\u5B58\u50A8\u914D\u7F6E +#\u9ED8\u8BA4\u4F7F\u7528\u7684\u5B58\u50A8\u5E73\u53F0 +spring.file-storage.default-platform=local +#".min.jpg" #\u7F29\u7565\u56FE\u540E\u7F00\uFF0C\u4F8B\u5982\u3010.min.jpg\u3011\u3010.png\u3011 +spring.file-storage.thumbnail-suffix=.jpg +# \u672C\u5730\u5B58\u50A8\uFF0C\u4E0D\u4F7F\u7528\u7684\u60C5\u51B5\u4E0B\u53EF\u4EE5\u4E0D\u5199 +# \u5B58\u50A8\u5E73\u53F0\u6807\u8BC6 +spring.file-storage.local[0].platform=local +#\u542F\u7528\u5B58\u50A8 +spring.file-storage.local[0].enable-storage=true +#\u542F\u7528\u8BBF\u95EE\uFF08\u7EBF\u4E0A\u8BF7\u4F7F\u7528 Nginx \u914D\u7F6E\uFF0C\u6548\u7387\u66F4\u9AD8\uFF09 +spring.file-storage.local[0].enable-access=false +# \u8BBF\u95EE\u57DF\u540D\uFF0C\u4F8B\u5982\uFF1A\u201Chttp://127.0.0.1:6023/image/\u201D\uFF0C\u6CE8\u610F\u540E\u9762\u8981\u548C path-patterns \u4FDD\u6301\u4E00\u81F4\uFF0C\u201C/\u201D\u7ED3\u5C3E\uFF0C\u672C\u5730\u5B58\u50A8\u5EFA\u8BAE\u4F7F\u7528\u76F8\u5BF9\u8DEF\u5F84\uFF0C\u65B9\u4FBF\u540E\u671F\u66F4\u6362\u57DF\u540D +spring.file-storage.local[0].domain= +# \u5B58\u50A8\u5730\u5740 +spring.file-storage.local[0].base-path=C:/jxj/prod/backEnd/itbgpImage/ +# \u8BBF\u95EE\u8DEF\u5F84\uFF0C\u5F00\u542F enable-access \u540E\uFF0C\u901A\u8FC7\u6B64\u8DEF\u5F84\u53EF\u4EE5\u8BBF\u95EE\u5230\u4E0A\u4F20\u7684\u6587\u4EF6 +spring.file-storage.local[0].path-patterns= +spring.file-storage.aliyun-oss[0].platform=aliyun-oss +spring.file-storage.aliyun-oss[0].enable-storage=false +spring.file-storage.aliyun-oss[0].access-key= +spring.file-storage.aliyun-oss[0].secret-key= +spring.file-storage.aliyun-oss[0].end-point= +spring.file-storage.aliyun-oss[0].bucket-name= +# \u8BBF\u95EE\u57DF\u540D\uFF0C\u6CE8\u610F\u201C/\u201D\u7ED3\u5C3E\uFF0C\u4F8B\u5982\uFF1Ahttps://abc.oss-cn-shanghai.aliyuncs.com/ +spring.file-storage.aliyun-oss[0].domain= +spring.file-storage.aliyun-oss[0].base-path= +# admin\u4E2D\u5BF9\u5E94\u7684\u5730\u5740\u53CA\u5B9E\u4F8B\u540D +spring.boot.admin.client.instance.service-url=http://localhost:18070 +spring.boot.admin.client.instance.name=zjsj +# \u6C34\u7535\u6570\u636E\u63A8\u9001\u5730\u5740 +double-carbon.water-data-url=http://test.cesms.net +double-carbon.ammeter-data-url=http://test.cesms.net +license.licensePath=C:/jxj/prod/backEnd/license/license.lic +license.publicKeysStorePath=C:/jxj/prod/backEnd/license/publicCerts.keystore +#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u7684\u6570\u636E\u540C\u6B65 +#\u4E09\u6C5Fmq\u768461616\u7AEF\u53E3\u5BF9\u5E94\u7684\u5730\u5740 +uop_sync_mq_brokerurl=tcp://116.169.63.183:31089 +#\u4E09\u6C5Fmq\u7684\u7528\u6237\u540D +uop_sync_mq_username=admin +#\u4E09\u6C5Fmq\u7684\u5BC6\u7801 +uop_sync_mq_password=admin +#\u4E09\u6C5F\u5F00\u542F\u6D88\u606F\u63A5\u6536 +c2_orguser_subscription=true +#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u5730\u5740 +sj.unifiedAuthentication.login.url=http://116.169.63.183:30913 +#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u8DF3\u8F6C\u540E\u63A5\u6536code\u7684\u5730\u5740 +#sj.unifiedAuthentication.login.code.url=http://wbtqry.natappfree.cc/xmgl/sj/unifiedAuthentication/getTokenByCode +#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u540E\u8DF3\u8F6Curl\uFF08pc\u7AEF\uFF09 +sj.unifiedAuthentication.success.redirect=http://192.168.34.226:8080/index.html#/login?UID= +#\u4E09\u6C5F\u7EDF\u4E00\u767B\u5F55\u6210\u529F\u540E\u8DF3\u8F6Curl\uFF08app\u7AEF\uFF09 +sj.unifiedAuthentication.success.redirect.app=http://192.168.34.226:8088/zjsjAPP/#/pages/projectManage/projectManage?UID= +#\u4E09\u6C5F\u4E1A\u52A1\u4E2D\u53F0\u7F51\u5173\u5730\u5740 +sj.business.gateway.url=http://116.169.63.183:30867/ +#\u4E09\u6C5F\u4E1A\u52A1\u4E2D\u53F0\u7F51\u5173\u5730\u5740\u7684\u8C03\u7528\u51ED\u8BC1 +sj.business.gateway.api.key=nDmkHCxlQzCqE-xfYteXMw +#\u4E09\u6C5F\u56FE\u7247\u8BBF\u95EE\u8DEF\u5F84\uFF08\u7528\u4E8E\u63A8\u9001\u4E1A\u52A1\u4E2D\u53F0\uFF09 +sj.upload.image.url.prefix=http://192.168.34.221:11111/image/ +