skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/constant/LauncherConstant.java
@@ -40,7 +40,7 @@ /** * nacos dev 地址 */ String NACOS_DEV_ADDR = "172.16.13.150:8848"; String NACOS_DEV_ADDR = "172.16.13.144:8848"; /** * nacos prod 地址 skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
@@ -40,13 +40,17 @@ PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); //自定义注册 PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "zhongrijian"); PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "zhongrijian"); PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong"); PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong"); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile)); PropsUtil.setProperty(props, "spring.datasource.dynamic.enabled", "false"); //自定义命名空间 PropsUtil.setProperty(props,"spring.cloud.nacos.config.namespace","guoshilong"); PropsUtil.setProperty(props,"spring.cloud.nacos.discovery.namespace","guoshilong"); // 开启elk日志 // PropsUtil.setProperty(props, "blade.log.elk.destination", LauncherConstant.elkAddr(profile));
@@ -9,9 +9,7 @@ @EnableFeignClients({"cn.gistack"}) @MapperScan({"org.springblade.**.mapper.**","cn.gistack.**.mapper.**"}) public class SmApplication { public static void main(String[] args) { BladeApplication.run("blade-sm", SmApplication.class, args); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupController.java
@@ -1,6 +1,7 @@ package cn.gistack.sm.patrol.controller; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -19,11 +20,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; /** /** * @Description: 巡查指标组 */ @Slf4j @Api(tags="巡查指标组") @Api(tags = "巡查指标组") @RestController @RequestMapping("/patrol/patrolGroup") @AllArgsConstructor @@ -35,9 +36,9 @@ * * @param patrolGroup */ @ApiOperation(value="巡查指标组-分页列表查询", notes="巡查指标组-分页列表查询") @ApiOperation(value = "巡查指标组-分页列表查询", notes = "巡查指标组-分页列表查询") @GetMapping(value = "/list") public R queryPageList(PatrolGroup patrolGroup,Query query) { public R queryPageList(PatrolGroup patrolGroup, Query query) { // IPage<PatrolGroup> pageList = patrolGroupService.selectPatrolConfig(Condition.getPage(query),patrolGroup); IPage<PatrolGroup> pageList = patrolGroupService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolGroup)); return R.data(pageList); @@ -49,7 +50,7 @@ * @param patrolGroup * @return */ @ApiOperation(value="巡查指标组-添加", notes="巡查指标组-添加") @ApiOperation(value = "巡查指标组-添加", notes = "巡查指标组-添加") @PostMapping(value = "/add") public R add(@RequestBody PatrolGroup patrolGroup) { return R.data(patrolGroupService.save(patrolGroup)); @@ -61,8 +62,8 @@ * @param patrolGroup * @return */ @ApiOperation(value="巡查指标组-编辑", notes="巡查指标组-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) @ApiOperation(value = "巡查指标组-编辑", notes = "巡查指标组-编辑") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public R edit(@RequestBody PatrolGroup patrolGroup) { return R.data(patrolGroupService.updateById(patrolGroup)); } @@ -73,9 +74,9 @@ * @param id * @return */ @ApiOperation(value="巡查指标组-通过id删除", notes="巡查指标组-通过id删除") @ApiOperation(value = "巡查指标组-通过id删除", notes = "巡查指标组-通过id删除") @DeleteMapping(value = "/delete") public R delete(@RequestParam(name="id",required=true) String id) { public R delete(@RequestParam(name = "id", required = true) String id) { return R.data(patrolGroupService.removeById(id)); } @@ -85,9 +86,9 @@ * @param ids * @return */ @ApiOperation(value="巡查指标组-批量删除", notes="巡查指标组-批量删除") @ApiOperation(value = "巡查指标组-批量删除", notes = "巡查指标组-批量删除") @DeleteMapping(value = "/deleteBatch") public R deleteBatch(@RequestParam(name="ids",required=true) String ids) { public R deleteBatch(@RequestParam(name = "ids", required = true) String ids) { return R.data(patrolGroupService.removeByIds(Arrays.asList(ids.split(",")))); } @@ -97,24 +98,34 @@ * @param id * @return */ @ApiOperation(value="巡查指标组-通过id查询", notes="巡查指标组-通过id查询") @ApiOperation(value = "巡查指标组-通过id查询", notes = "巡查指标组-通过id查询") @GetMapping(value = "/queryById") public R queryById(@RequestParam(name="id",required=true) String id) { public R queryById(@RequestParam(name = "id", required = true) String id) { PatrolGroup patrolGroup = patrolGroupService.getById(id); return R.data(patrolGroup); } // /** // * 根据工程id查询巡查指标组 // * // * @param productId // * @return // */ // @AutoLog(value = "巡查指标组-根据工程id查询巡查指标组") // @ApiOperation(value="巡查指标组-根据工程id查询巡查指标组", notes="巡查指标组-根据工程id查询巡查指标组") // @GetMapping(value = "/queryTree") // public R<?> queryTree(@RequestParam(name="productId",required=true) String productId) { // WaterConservancyProjectVO waterConservancyProjectVO = patrolGroupService.queryTree(productId); // return R.OK(waterConservancyProjectVO); // } /** * 根据工程id查询巡查指标组 * * @return */ @ApiOperation(value = "巡查指标组-根据工程id查询巡查指标组", notes = "巡查指标组-根据工程id查询巡查指标组") @GetMapping(value = "/getPatrolGroupByProjectId") public R queryTree(@RequestParam(name = "projectId", required = true) String projectId) { List<PatrolGroup> list = patrolGroupService.getPatrolGroupByProjectId(projectId); return R.data(list); } /** * 获取全部指标组 * * @return */ @ApiOperation(value = "获取全部指标组", notes = "获取全部指标组") @GetMapping(value = "/all") public R getAll() { List<PatrolGroup> list = patrolGroupService.list(); return R.data(list); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolGroupItemController.java
@@ -45,8 +45,7 @@ @ApiOperation(value="巡查指标项目-分页列表查询", notes="巡查指标项目-分页列表查询") @GetMapping(value = "/list") public R queryPageList(PatrolGroupItem patrolGroupItem, Query query) { // IPage<PatrolGroupItem> pageList = patrolGroupItemService.selectPatrolConfig(Condition.getPage(query),patrolGroupItem); IPage<PatrolGroupItem> pageList = patrolGroupItemService.page(Condition.getPage(query), Condition.getQueryWrapper(patrolGroupItem)); IPage<PatrolGroupItem> pageList = patrolGroupItemService.selectPatrolConfig(Condition.getPage(query),patrolGroupItem); return R.data(pageList); }
@@ -1,6 +1,7 @@ package cn.gistack.sm.patrol.controller; import java.util.Arrays; import java.util.List; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -47,6 +48,16 @@ return R.data(pageList); } /** * 获取所有巡查类型 */ @ApiOperation(value="获取所有巡查类型", notes="获取所有巡查类型") @GetMapping(value = "/all") public R getAll(){ List<PatrolType> list = patrolTypeService.list(); return R.data(list); } /** * 添加 * skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolConfigMapper.xml
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupItemMapper.xml
File was renamed from skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/xml/PatrolGroupItemMapper.xml @@ -3,7 +3,7 @@ <mapper namespace="cn.gistack.sm.patrol.mapper.PatrolGroupItemMapper"> <select id="selectPatrolGroupItemList" resultType="cn.gistack.sm.patrol.entity.PatrolGroupItem"> SELECT * FROM sm_patrol_group_item WHERE is_deleted = 0 SELECT id,group_id,items_name,name FROM SM_PATROL_GROUP_ITEM WHERE is_deleted = 0 <if test="patrolGroupItem.groupId != null and patrolGroupItem.groupId != '' "> and group_id = #{patrolGroupItem.groupId} </if> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.java
@@ -4,9 +4,12 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param; import java.util.List; /** * @Description: 巡查指标组 */ public interface PatrolGroupMapper extends BaseMapper<PatrolGroup> { List<PatrolGroup> getPatrolGroupByProjectId(@Param("projectId") String projectId); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolGroupMapper.xml
New file @@ -0,0 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="cn.gistack.sm.patrol.mapper.PatrolGroupMapper"> <select id="getPatrolGroupByProjectId" resultType="cn.gistack.sm.patrol.entity.PatrolGroup"> SELECT g.id,g.name FROM sm_patrol_group g WHERE g.is_deleted = 0 AND g.project_id = #{projectId} </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolInfoMapper.xml
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTypeMapper.xml
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/xml/PatrolGroupMapper.xml
File was deleted skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolGroupService.java
@@ -4,10 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import java.util.List; /** * @Description: 巡查指标组 */ public interface IPatrolGroupService extends BaseService<PatrolGroup> { IPage<PatrolGroup> selectPatrolConfig(IPage<Object> page, PatrolGroup patrolGroup); List<PatrolGroup> getPatrolGroupByProjectId(String projectId); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolGroupServiceImpl.java
@@ -10,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import java.util.List; /** * @Description: 巡查指标组 */ @@ -20,4 +22,9 @@ public IPage<PatrolGroup> selectPatrolConfig(IPage<Object> page, PatrolGroup patrolGroup) { return null; } @Override public List<PatrolGroup> getPatrolGroupByProjectId(String projectId) { return baseMapper.getPatrolGroupByProjectId(projectId); } }
