skjcmanager/skjcmanager-gateway/src/main/java/cn/gistack/gateway/provider/AuthProvider.java
@@ -55,6 +55,7 @@ DEFAULT_SKIP_URL.add("/manager/check-upload"); DEFAULT_SKIP_URL.add("/error/**"); DEFAULT_SKIP_URL.add("/assets/**"); DEFAULT_SKIP_URL.add("/simulate/simulate/**"); } /** skjcmanager/skjcmanager-service-api/skjcmanager-system-api/src/main/java/cn/gistack/system/entity/Menu.java
@@ -88,6 +88,17 @@ private String source; /** * 图标路径 */ @ApiModelProperty(value = "图标路径") private String iconPath; /** * 组件类型 */ private String components; /** * 排序 */ @ApiModelProperty(value = "排序") @@ -105,6 +116,8 @@ @ApiModelProperty(value = "操作按钮类型") private Integer action; /** * 是否打开新页面 */ skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml
@@ -27,7 +27,7 @@ AND item.id = #{id} </select> <select id="getItemByItemIds" resultType="cn.gistack.sm.patrol.entity.PatrolGroupItem"> SELECT ID,GROUP_ID,ITEMS_NAME,DESCRIPTION FROM BLADEX.SM_PATROL_GROUP_ITEM SELECT ID,GROUP_ID,ITEMS_NAME,DESCRIPTION FROM SM_PATROL_GROUP_ITEM WHERE ID IN <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")"> #{item} skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
@@ -67,11 +67,11 @@ <select id="getPatrolGroupByItemId" resultType="cn.gistack.sm.patrol.entity.PatrolGroup"> SELECT distinct b.ID,b.NAME FROM ( SELECT ID,GROUP_ID FROM BLADEX.SM_PATROL_GROUP_ITEM WHERE ID IN SELECT ID,GROUP_ID FROM SM_PATROL_GROUP_ITEM WHERE ID IN <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach> ) a ,BLADEX.SM_PATROL_GROUP b ) a ,SM_PATROL_GROUP b WHERE b.is_deleted = 0 AND a.group_id = b.id </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolRecordMapper.xml
@@ -35,7 +35,7 @@ <select id="selectPatrolRecord" resultMap="selectPatrolRecordList"> SELECT record.id,record.patrol_type,record.device_ids,record.images,record.videos,record.content,record.status,record.item_id,record.task_id,record.patrol_route,record.update_time, dmgeo.ST_AsGeoJSON(task.route_coordinates) taskRoute,item.items_name itemsName,item.description task.route_coordinates taskRoute,item.items_name itemsName,item.description FROM SM_PATROL_RECORD record LEFT JOIN sm_patrol_type type ON type.id = record.patrol_type LEFT JOIN sm_patrol_task task ON task.id = record.task_id @@ -72,19 +72,19 @@ SELECT r.id,r.patrol_type,r.device_ids,r.images,r.videos,r.content,r.status,r.item_id,r.task_id,r.update_time, c.name groupName,c.id groupId,c.items_name itemsName,c.description, u.real_name FROM BLADEX.SM_PATROL_RECORD r FROM SM_PATROL_RECORD r LEFT JOIN (SELECT g.ID,g.NAME,a.id itemId, a.items_name,description FROM ( SELECT ID,GROUP_ID,items_name,description FROM BLADEX.SM_PATROL_GROUP_ITEM WHERE ID IN SELECT ID,GROUP_ID,items_name,description FROM SM_PATROL_GROUP_ITEM WHERE ID IN <foreach collection="itemIds.split(',')" item="item" index="index" open="(" separator="," close=")"> #{item} </foreach> ) a ,BLADEX.SM_PATROL_GROUP g ) a ,SM_PATROL_GROUP g WHERE g.is_deleted = 0 AND a.group_id = g.id) c ON c.itemId = r.item_id LEFT JOIN BLADEX.SM_PATROL_TASK t ON t.id = r.task_id LEFT JOIN SM_PATROL_TASK t ON t.id = r.task_id LEFT JOIN BLADE_USER u ON u.id = r.create_user where r.task_id = #{taskId} </select> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -31,8 +31,8 @@ spt.task_type as patrolType, spt2.name as patrolTypeName, count(*) as number FROM BLADEX.sm_patrol_task spt left join BLADEX.sm_patrol_type spt2 on spt.task_type = spt2.id FROM sm_patrol_task spt left join sm_patrol_type spt2 on spt.task_type = spt2.id WHERE spt.is_deleted = 0 group by spt.task_type,spt2.name </select> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/simulateData/controller/SimulateController.java
New file @@ -0,0 +1,193 @@ package cn.gistack.sm.simulateData.controller; import cn.gistack.sm.patrol.entity.PatrolConfig; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** * @Description: 模拟数据 */ @Slf4j @Api(tags="模拟数据") @RestController @RequestMapping("/simulate/simulate") @AllArgsConstructor public class SimulateController extends BladeController { /** * 不同规模水库数量统计 */ @ApiOperation(value="不同规模水库数量统计", notes="不同规模水库数量统计") @GetMapping(value = "/res_scal_count") public R resScalCount() { JSONArray jsonArray = new JSONArray(); JSONObject jsonObject = new JSONObject(); jsonObject.put("ad_code","430000"); jsonObject.put("ad_name","武汉市"); jsonObject.put("p_ad_code","420000"); jsonObject.put("p_ad_name","湖北省"); jsonObject.put("large_res_1",20); jsonObject.put("large_res_2",40); jsonObject.put("medium_res",80); jsonObject.put("small_res_1",75); jsonObject.put("small_res_2",68); jsonObject.put("res_number",600); jsonObject.put("large_res_1_cap",70); jsonObject.put("large_res_2_cap",69); jsonObject.put("medium_res_cap",37); jsonObject.put("small_res_1_cap",10); jsonObject.put("small_res_2_cap",68); jsonObject.put("res_cap_num",90); jsonArray.add(jsonObject); return R.data(jsonArray); } /** * 老库水库基础信息 */ @ApiOperation(value="老库水库基础信息", notes="老库水库基础信息") @GetMapping(value = "/skInfo") public R skInfo() { JSONArray jsonArray = new JSONArray(); JSONObject jsonObject = new JSONObject(); jsonObject.put("skcd","SK00001"); jsonObject.put("sknm","001号水库"); jsonObject.put("addvcd","420000"); jsonObject.put("raddvcd","420000"); jsonObject.put("adcd","420010"); jsonObject.put("lgtd",113.5946612312); jsonObject.put("lttd",29.123165498); jsonObject.put("stlc","武汉市高新大道"); jsonObject.put("szyqnm","水资源三级区名称"); jsonObject.put("rvnm","河流名称"); jsonObject.put("sktp","水库分类"); jsonObject.put("pjgrd","工程等级"); jsonObject.put("rsvrtp","水库类型"); jsonObject.put("adminunit","管理单位"); jsonObject.put("drctrdpt","主管部门"); jsonObject.put("admindpt","归口管理部门"); jsonObject.put("adminlevel","管理级别"); jsonObject.put("bsnm","流域名称"); jsonObject.put("bxskbh","病险水库编码"); jsonObject.put("szyqcd","水资源三级区编码"); jsonObject.put("rvcd","河流（湖泊）编码"); jsonObject.put("adnm","乡镇名称"); jsonObject.put("license","水库注册号"); jsonObject.put("regdpt","水库注册部门"); jsonObject.put("regdate","水库注册时间"); jsonObject.put("securitytype","安全类型"); jsonObject.put("phcd","拼音码"); jsonObject.put("stcd","测站编码"); jsonObject.put("rsincd","注册登记内部编码"); jsonObject.put("rstatus","水库状态"); jsonObject.put("enabled","是否启用"); jsonObject.put("depttp","责任部门"); jsonObject.put("sfyz","SFYZ"); jsonObject.put("moditime","2023-04-12"); jsonArray.add(jsonObject); return R.data(jsonArray); } /** * 行政区划不同规模水库数量 */ @ApiOperation(value="行政区划不同规模水库数量", notes="行政区划不同规模水库数量") @GetMapping(value = "/dws_ad_res_count") public R dwsAdResCount() { JSONArray list = new JSONArray(); JSONObject jsonObject = new JSONObject(); jsonObject.put("ad_code","430000"); jsonObject.put("ad_name","武汉市"); jsonObject.put("p_ad_code","420000"); jsonObject.put("p_ad_name","湖北省"); jsonObject.put("large_res_1",50); jsonObject.put("large_res_2",40); jsonObject.put("medium_res",30); jsonObject.put("small_res_1",20); jsonObject.put("small_res_2",10); jsonObject.put("res_number",60); list.add(jsonObject); return R.data(list); } /** * 行政区划不同降雨等级数量统计 */ @ApiOperation(value="行政区划不同降雨等级数量统计", notes="行政区划不同降雨等级数量统计") @GetMapping(value = "/dws_ad_rain_level_count") public R dwsAdRainLevelCount() { JSONArray list = new JSONArray(); JSONObject j1 = new JSONObject(); j1.put("ad_code","430000"); j1.put("ad_name","武汉市"); j1.put("wy",50); j1.put("xy",40); j1.put("zy",30); j1.put("dy",20); j1.put("bay",10); j1.put("tdby",60); j1.put("wuy",60); j1.put("count_num",60); j1.put("update_time","2023-04-12"); JSONObject j2 = new JSONObject(); j2.put("ad_code","430020"); j2.put("ad_name","鄂州市"); j2.put("wy",10); j2.put("xy",24); j2.put("zy",34); j2.put("dy",12); j2.put("bay",38); j2.put("tdby",67); j2.put("wuy",48); j2.put("count_num",80); j2.put("update_time","2023-04-12"); JSONObject j3 = new JSONObject(); j3.put("ad_code","430022"); j3.put("ad_name","黄石市"); j3.put("wy",10); j3.put("xy",24); j3.put("zy",34); j3.put("dy",12); j3.put("bay",38); j3.put("tdby",67); j3.put("wuy",48); j3.put("count_num",80); j3.put("update_time","2023-04-12"); list.add(j2); list.add(j1); list.add(j3); return R.data(list); } /** * 不同规模水库数量统计 */ @ApiOperation(value="不同规模水库数量统计", notes="不同规模水库数量统计") @GetMapping(value = "/city_danger_res_count") public R cityDangerResCount() { JSONArray jsonArray = new JSONArray(); JSONObject jsonObject = new JSONObject(); jsonObject.put("city_ad_code","430000"); jsonObject.put("eng_scal",2); jsonObject.put("num",50); jsonArray.add(jsonObject); return R.data(jsonArray); } } skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/controller/MenuController.java
@@ -43,6 +43,7 @@ import springfox.documentation.annotations.ApiIgnore; import javax.validation.Valid; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -184,6 +185,24 @@ } /** * 动态获取菜单数据 */ @GetMapping("/dynamicMenu") @ApiOperationSupport(order = 8) @ApiOperation(value = "动态获取菜单数据", notes = "动态获取菜单数据") public R dynamicMenu(String roleId,String flag){ List<MenuVO> list = new ArrayList<>(); if (flag.equals("web")){ list = menuService.getWebMenu(roleId); } if (flag.equals("app")){ list = menuService.getAppMenu(roleId); } return R.data(list); } /** * 前端按钮数据 */ @GetMapping("/buttons") skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.java
@@ -20,6 +20,7 @@ import cn.gistack.system.entity.Menu; import cn.gistack.system.vo.MenuVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import org.springblade.core.tool.node.TreeNode; import java.util.List; @@ -180,4 +181,6 @@ * @return */ List<MenuDTO> authRoutes(List<Long> roleIds); List<MenuVO> selectAppMenu(@Param("roleId") String roleId); } skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/MenuMapper.xml
@@ -475,4 +475,12 @@ GROUP BY m.path </select> <select id="selectAppMenu" resultType="cn.gistack.system.vo.MenuVO"> SELECT MENU.* FROM BLADE_MENU MENU LEFT JOIN BLADE_MENU TOPMENU ON TOPMENU.ID = MENU.PARENT_ID LEFT JOIN BLADE_ROLE_MENU BRM ON BRM.MENU_ID = MENU.ID WHERE TOPMENU.NAME='app' AND BRM.ROLE_ID = #{roleId} </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/IMenuService.java
@@ -163,4 +163,7 @@ */ boolean submit(Menu menu); List<MenuVO> getAppMenu(String roleId); List<MenuVO> getWebMenu(String roleId); } skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/service/impl/MenuServiceImpl.java
@@ -294,4 +294,14 @@ return saveOrUpdate(menu); } @Override public List<MenuVO> getAppMenu(String roleId) { return baseMapper.selectAppMenu(roleId); } @Override public List<MenuVO> getWebMenu(String roleId) { return null; } }
