skjcmanager/skjcmanager-common/src/main/java/cn/gistack/common/launch/LauncherServiceImpl.java
@@ -40,8 +40,8 @@ PropsUtil.setProperty(props, "spring.cloud.nacos.config.server-addr", LauncherConstant.nacosAddr(profile)); //自定义注册 PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "guoshilong"); PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "guoshilong"); PropsUtil.setProperty(props, "spring.cloud.nacos.config.namespace", "zhongrijian"); PropsUtil.setProperty(props, "spring.cloud.nacos.discovery.namespace", "zhongrijian"); PropsUtil.setProperty(props, "spring.cloud.sentinel.transport.dashboard", LauncherConstant.sentinelAddr(profile)); PropsUtil.setProperty(props, "spring.zipkin.base-url", LauncherConstant.zipkinAddr(profile)); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
@@ -60,6 +60,18 @@ return R.data(patrolTaskService.save(patrolTask)); } /** * 自定义添加 * @param patrolTask * @return */ @ApiOperation(value="巡查任务-自定义添加", notes="巡查任务-自定义添加") @PostMapping(value = "/save") public R save(@RequestBody PatrolTask patrolTask) { return R.data(patrolTaskService.savePatrolTask(patrolTask)); } /** * 编辑 * @return @@ -68,6 +80,18 @@ @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) public R edit(@RequestBody PatrolTask patrolTask) { return R.data(patrolTaskService.updateById(patrolTask)); } /** * 自定义编辑（空间坐标编辑） * @param patrolTask * @return */ @ApiOperation(value="巡查任务-自定义编辑", notes="巡查任务-自定义编辑") @RequestMapping(value = "/update", method = {RequestMethod.PUT,RequestMethod.POST}) public R update(@RequestBody PatrolTask patrolTask) { return R.data(patrolTaskService.updatePatrolTask(patrolTask)); } /** @@ -109,6 +133,19 @@ /** * 自定义通过id查询 * @param id * @return */ @ApiOperation(value="巡查任务-自定义通过id查询", notes="巡查任务-自定义通过id查询") @GetMapping(value = "/getPatrolTaskById") public R getPatrolTaskById(@RequestParam(name="id",required=true) String id) { PatrolTask PatrolTask = patrolTaskService.getPatrolTaskById(id); return R.data(PatrolTask); } /** * 查询巡查人员统计数据信息 * @param patrolTask * @return skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/entity/PatrolTask.java
@@ -89,4 +89,11 @@ */ @ApiModelProperty(value = "巡查项ID(多个)") private String patrolGroupItemId; /** * 路线空间数据 */ @ApiModelProperty(value = "路线空间数据") private String routeCoordinates; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.java
@@ -24,4 +24,25 @@ * @return */ List<PatrolTaskStatisticsVO> getPatrolTaskStatistic(@Param("patrolTask") PatrolTaskVO patrolTask); /** * 自定义编辑（空间坐标编辑） * @param patrolTask * @return */ Integer updatePatrolTask(@Param("patrolTask") PatrolTask patrolTask); /** * 自定义添加 * @param patrolTask * @return */ Integer savePatrolTask(@Param("patrolTask") PatrolTask patrolTask); /** * 自定义通过id查询 * @param id * @return */ PatrolTask getPatrolTaskById(@Param("id")String id); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -37,4 +37,81 @@ WHERE spt.is_deleted = 0 group by spt.task_type,spt2.name </select> <!--自定义修改巡查任务数据--> <update id="updatePatrolTask"> update sm_patrol_task SET <if test="patrolTask.projectId !=null and patrolTask.projectId !=''"> project_id = #{patrolTask.projectId}, </if> <if test="patrolTask.title !=null and patrolTask.title !=''"> title = #{patrolTask.title}, </if> <if test="patrolTask.startTime !=null and patrolTask.startTime !=''"> start_time = #{patrolTask.startTime}, </if> <if test="patrolTask.endTime !=null and patrolTask.endTime !=''"> end_time = #{patrolTask.endTime}, </if> <if test="patrolTask.content !=null and patrolTask.content !=''"> content = #{patrolTask.content}, </if> <if test="patrolTask.toUserId !=null and patrolTask.toUserId !=''"> to_user_id = #{patrolTask.toUserId}, </if> <if test="patrolTask.routeCoordinates !=null and patrolTask.routeCoordinates !=''"> route_coordinates = dmgeo.ST_LineFromText(${patrolTask.routeCoordinates},0), </if> <if test="patrolTask.updateUser !=null and patrolTask.updateUser !=''"> update_user = #{patrolTask.updateUser}, </if> <if test="patrolTask.status !=null and patrolTask.status !=''"> status = #{patrolTask.status}, </if> <if test="patrolTask.taskType !=null and patrolTask.taskType !=''"> task_type = #{patrolTask.taskType}, </if> <if test="patrolTask.patrolGroupItemId !=null and patrolTask.patrolGroupItemId !=''"> patrol_group_item_id = #{patrolTask.patrolGroupItemId}, </if> <if test="patrolTask.source !=null and patrolTask.source !=''"> source = #{patrolTask.source}, </if> <if test="patrolTask.state !=null and patrolTask.state !=''"> state = #{patrolTask.state}, </if> <if test="patrolTask.routeId !=null and patrolTask.routeId !=''"> route_id = #{patrolTask.routeId}, </if> update_time = #{patrolTask.updateTime} where id=#{patrolTask.id} </update> <!--新增--> <insert id="savePatrolTask"> INSERT INTO sm_patrol_task ( title,start_time,end_time,content,to_user_id, route_id,state,source,task_type,project_id, patrol_group_item_id,route_coordinates ) VALUES ( #{patrolTask.title},#{patrolTask.startTime},#{patrolTask.endTime},#{patrolTask.content},#{patrolTask.toUserId}, #{patrolTask.routeId},#{patrolTask.state},#{patrolTask.source},#{patrolTask.taskType},#{patrolTask.projectId}, #{patrolTask.createDept},#{patrolTask.createTime},#{patrolTask.updateUser}, #{patrolTask.patrolGroupItemId},dmgeo.ST_LineFromText(${patrolTask.routeCoordinates}) ); </insert> <!--自定义查询详情--> <select id="getPatrolTaskById" resultType="cn.gistack.sm.patrol.entity.PatrolTask"> select spt.id,spt.title,spt.start_time,spt.end_time,spt.content,spt.to_user_id, spt.route_id,spt.state,spt.source,spt.task_type,spt.project_id, spt.patrol_group_item_id,dmgeo.ST_AsGeoJSON(spt.route_coordinates) AS route_coordinates FROM sm_patrol_task spt where spt.id = #{id} </select> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
@@ -21,4 +21,25 @@ * @return */ Object getPatrolTaskStatistic(PatrolTaskVO patrolTask); /** * 自定义编辑（空间坐标编辑） * @param patrolTask * @return */ Boolean updatePatrolTask(PatrolTask patrolTask); /** * 自定义添加 * @param patrolTask * @return */ Boolean savePatrolTask(PatrolTask patrolTask); /** * 自定义通过id查询 * @param id * @return */ PatrolTask getPatrolTaskById(String id); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -31,4 +31,38 @@ public Object getPatrolTaskStatistic(PatrolTaskVO patrolTask) { return baseMapper.getPatrolTaskStatistic(patrolTask); } /** * 自定义编辑（空间坐标编辑） * @param patrolTask * @return */ @Override public Boolean updatePatrolTask(PatrolTask patrolTask) { Integer update = baseMapper.updatePatrolTask(patrolTask); //返回 return update>0?true:false; } /** * 自定义添加 * @param patrolTask * @return */ @Override public Boolean savePatrolTask(PatrolTask patrolTask) { Integer save = baseMapper.savePatrolTask(patrolTask); //返回 return save>0?true:false; } /** * 自定义通过id查询 * @param id * @return */ @Override public PatrolTask getPatrolTaskById(String id) { return baseMapper.getPatrolTaskById(id); } }
