Merge remote-tracking branch 'origin/jtdev' into jtdev

guoshilong

2023-06-14 97c752f75880ff6b799b146ea45fefc2c1d59fa5

Merge remote-tracking branch 'origin/jtdev' into jtdev

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/entity/CallNotFillRecord.java

New file
@@ -0,0 +1,85 @@
package cn.gistack.sm.intelligentCall.entity;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import java.util.Date;

/**
 * 外呼未接信息填报表
 *
 * @author zhongrj
 * @date 2023-06-13
 */
@Data
@TableName("sm_call_fill_record")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value = "sm_call_fill_record对象", description = "外呼未接信息填报")
public class CallNotFillRecord {

    /**
     * 主键id
     */
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private Long id;

    /**
     * 是否为巡查责任人
     */
    @ApiModelProperty(value = "是否为巡查责任人")
    private String isPatrolPerson;

    /**
     * 是否已巡查
     */
    @ApiModelProperty(value = "是否已巡查")
    private String isPatrol;

    /**
     * 是否超汛限
     */
    @ApiModelProperty(value = "是否超汛限")
    private String isOver;

    /**
     * 是否发现险情
     */
    @ApiModelProperty(value = "是否发现险情")
    private String isDanger;

    /**
     * 联系人号码
     */
    @ApiModelProperty(value = "联系人号码")
    private String tel;

    /**
     * 外呼任务id
     */
    @ApiModelProperty(value = "外呼任务id")
    private String taskId;

    /**
     * 水库guid
     */
    @ApiModelProperty(value = "水库guid")
    private String waterGuid;

    /**
     * 创建人
     */
    @ApiModelProperty(value = "创建人")
    private Long createUser;

    /**
     * 创建时间
     */
    @ApiModelProperty(value = "创建时间")
    private Date createTime;
}

 skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/intelligentCall/vo/CallNotFillRecordVO.java

New file
@@ -0,0 +1,15 @@
package cn.gistack.sm.intelligentCall.vo;

import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.entity.CallTaskResult;
import lombok.Data;

/**
 * 外呼未接/拒绝信息填报记录 vo
 * @author zhongrj
 * @date 2023-06-13
 */
@Data
public class CallNotFillRecordVO extends CallNotFillRecord {

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/geoJson/controller/TownsGeoJsonController.java

New file
@@ -0,0 +1,121 @@
package cn.gistack.sm.geoJson.controller;

import cn.gistack.sm.geoJson.entity.TownsGeoJson;
import cn.gistack.sm.geoJson.service.ITownsGeoJsonService;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import io.swagger.annotations.Api;
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.tool.api.R;
import org.springblade.core.tool.utils.StringUtil;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;

import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: aix
 * @DATE: 2023/6/13 19:50
 */
@Slf4j
@Api(tags="乡镇geoJson数据")
@RestController
@RequestMapping("/town/geoJson")
@AllArgsConstructor
public class TownsGeoJsonController extends BladeController {

    private ITownsGeoJsonService townsGeoJsonService;

    @GetMapping(value = "/findGeoJsonByCode")
    public R findGeoJsonByCode(@ApiIgnore @RequestParam Map<String, Object> obj) {
        QueryWrapper<TownsGeoJson> queryWrapper = new QueryWrapper<>();
        if (null == obj.get("level") || null == obj.get("code"))
            return R.fail("参数不正确");
        String level = obj.get("level").toString();
        String code = obj.get("code").toString();

        Map<String, Object> ret = new HashMap<>();
        ret.put("type", "FeatureCollection");

        if (level.equals("1")) {

            ret.put("features", townsGeoJsonService.list());
        } else if (level.equals("2")) {
            code = code.substring(0,4);
            ret.put("features", townsGeoJsonService.list(queryWrapper.lambda().likeRight(TownsGeoJson::getCityId,code)));
        } else if (level.equals("3")) {
            code = code.substring(0,6);
            ret.put("features", townsGeoJsonService.list(queryWrapper.lambda().likeRight(TownsGeoJson::getCountyId,code)));
        } else {
            ret.put("features", townsGeoJsonService.list(queryWrapper.lambda().eq(TownsGeoJson::getAreaId,code)));
        }
        return R.data(ret);
    }

    /**
     * 本地初始化执行一次就可以
     * @return
     */
//    @GetMapping(value = "/initData")
    public R queryPageList() {
        initData();
        return R.data(200, null, "初始化成功");
    }

    private void initData() {

        //解析JSON文件的内容
        try {
            // 流读
            File file=new File("D:\\汇图信息\\湖北水利研究院\\开发文档\\geojson\\towns.json");
            FileReader fr=new FileReader(file);
            char[] cbuf=new char[5];
            int len;
            StringBuffer sb = new StringBuffer();
            while((len=fr.read(cbuf))!=-1){
                String str=new String(cbuf,0,len);
                sb.append(str);
            }
            // 关闭流
            fr.close();

            // 开始操作json
            JSONObject obj = JSONObject.parseObject(sb.toString());
//            //删除除features以外其它对象，方便下面所需的geojson字符串
            obj.remove("type");
            obj.remove("name");
            obj.remove("crs");
            JSONArray array = obj.getJSONArray("features");
            for (int i = 0; i < array.size(); i++) {
                JSONObject feature = array.getJSONObject(i);
                TownsGeoJson townsGeoJson = new TownsGeoJson();
                townsGeoJson.setName(feature.getJSONObject("properties").get("NAME").toString());
                townsGeoJson.setAreaId(feature.getJSONObject("properties").get("area_id").toString());
                townsGeoJson.setCityId(feature.getJSONObject("properties").get("city_id").toString());
                townsGeoJson.setCityName(feature.getJSONObject("properties").get("city_nm").toString());
                townsGeoJson.setCountyId(feature.getJSONObject("properties").get("county_id").toString());
                townsGeoJson.setCountyName(feature.getJSONObject("properties").get("county_nm").toString());
                townsGeoJson.setGeometry(feature.getJSONObject("geometry"));
                townsGeoJson.setProperties(feature.getJSONObject("properties"));
                townsGeoJsonService.save(townsGeoJson);
            }

        } catch (IOException e) {
            e.printStackTrace();
        }
    }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/geoJson/entity/TownsGeoJson.java

New file
@@ -0,0 +1,52 @@
package cn.gistack.sm.geoJson.entity;

import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import org.springblade.core.mp.base.BaseEntity;

/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION: 乡镇geoJson对象
 * @USER: aix
 * @DATE: 2023/6/13 18:59
 */
@Data
@TableName(value = "sm_towns_geo_json",autoResultMap = true)
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="乡镇geoJson对象", description="乡镇geoJson对象")
public class TownsGeoJson extends BaseEntity {

    @ApiModelProperty("市")
    private String cityId;

    @ApiModelProperty("市名称")
    private String cityName;

    @ApiModelProperty("区县")
    private String countyId;

    @ApiModelProperty("区县名称")
    private String countyName;

    @ApiModelProperty("乡")
    private String areaId;

    @ApiModelProperty("乡名称")
    private String name;

    private String type = "Feature";

    @TableField(typeHandler = FastjsonTypeHandler.class)
    private Object geometry;

    @TableField(typeHandler = FastjsonTypeHandler.class)
    private Object properties;

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/geoJson/mapper/TownsGeoJsonMapper.java

New file
@@ -0,0 +1,13 @@
package cn.gistack.sm.geoJson.mapper;

import cn.gistack.sm.geoJson.entity.TownsGeoJson;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;

/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: aix
 * @DATE: 2023/6/13 19:14
 */
public interface TownsGeoJsonMapper extends BaseMapper<TownsGeoJson> {
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/geoJson/mapper/TownsGeoJsonMapper.xml

New file
@@ -0,0 +1,5 @@
<?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.geoJson.mapper.TownsGeoJsonMapper">
    <!--namespace根据自己需要创建的的mapper的路径和名称填写-->
</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/geoJson/service/ITownsGeoJsonService.java

New file
@@ -0,0 +1,13 @@
package cn.gistack.sm.geoJson.service;

import cn.gistack.sm.geoJson.entity.TownsGeoJson;
import org.springblade.core.mp.base.BaseService;

/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: aix
 * @DATE: 2023/6/13 19:16
 */
public interface ITownsGeoJsonService extends BaseService<TownsGeoJson> {
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/geoJson/service/impl/TownsGeoJsonServiceImpl.java

New file
@@ -0,0 +1,17 @@
package cn.gistack.sm.geoJson.service.impl;

import cn.gistack.sm.geoJson.entity.TownsGeoJson;
import cn.gistack.sm.geoJson.mapper.TownsGeoJsonMapper;
import cn.gistack.sm.geoJson.service.ITownsGeoJsonService;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springframework.stereotype.Service;

/**
 * @PROJECT_NAME: skjcmanager
 * @DESCRIPTION:
 * @USER: aix
 * @DATE: 2023/6/13 19:16
 */
@Service
public class TownsGeoJsonServiceImpl extends BaseServiceImpl<TownsGeoJsonMapper, TownsGeoJson> implements ITownsGeoJsonService {
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/controller/CallNotFillRecordController.java

New file
@@ -0,0 +1,130 @@
package cn.gistack.sm.intelligentCall.controller;


import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.service.ICallNotFillRecordService;
import cn.gistack.sm.intelligentCall.vo.CallNotFillRecordVO;
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.*;

import java.util.Arrays;

/**
* 外呼未接信息填报记录
* @author zhongrj
* @date  2023-06-13
*/
@Slf4j
@Api(tags="外呼未接信息填报记录")
@RestController
@RequestMapping("/callNotFillRecord/callNotFillRecord")
@AllArgsConstructor
public class CallNotFillRecordController{

   private ICallNotFillRecordService callNotFillRecordService;

   /**
    * 分页列表查询
    *
    * @param callNotFillRecord
    * @return
    */
   @ApiOperation(value="外呼未接信息填报记录-分页列表查询", notes="外呼未接信息填报记录-分页列表查询")
   @GetMapping(value = "/list")
   public R queryPageList(CallNotFillRecord callNotFillRecord, Query query) {
       IPage<CallNotFillRecord> pageList = callNotFillRecordService.page(Condition.getPage(query), Condition.getQueryWrapper(callNotFillRecord));
       return R.data(pageList);
   }


   /**
    * 自定义分页列表查询
    * @param query
    * @param callNotFillRecord
    * @return
    */
   @ApiOperation(value="外呼未接信息填报记录-自定义分页列表查询", notes="外呼未接信息填报记录-自定义分页列表查询")
   @GetMapping(value = "/page")
   public R page(CallNotFillRecordVO callNotFillRecord, Query query) {
       return R.data(callNotFillRecordService.selectCallNotFillRecordPage(Condition.getPage(query),callNotFillRecord));
   }

    /**
     * 获取全部
     */
    @ApiOperation(value="外呼未接信息填报记录-获取全部", notes="外呼未接信息填报记录-获取全部")
    @GetMapping(value = "/all")
    public R getAll(CallNotFillRecord callNotFillRecord) {
        return R.data(callNotFillRecordService.list(Condition.getQueryWrapper(callNotFillRecord)));
    }

   /**
    * 添加
    *
    * @param callNotFillRecord
    * @return
    */
   @ApiOperation(value="外呼未接信息填报记录-添加", notes="外呼未接信息填报记录-添加")
   @PostMapping(value = "/add")
   public R add(@RequestBody CallNotFillRecord callNotFillRecord) {
       return R.data(callNotFillRecordService.save(callNotFillRecord));
   }

   /**
    * 编辑
    *
    * @param callNotFillRecord
    * @return
    */
   @ApiOperation(value="外呼未接信息填报记录-编辑", notes="外呼未接信息填报记录-编辑")
   @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
   public R edit(@RequestBody CallNotFillRecord callNotFillRecord) {
       return R.data(callNotFillRecordService.updateById(callNotFillRecord));
   }

   /**
    * 通过id删除
    *
    * @param id
    * @return
    */
   @ApiOperation(value="外呼未接信息填报记录-通过id删除", notes="外呼未接信息填报记录-通过id删除")
   @PostMapping(value = "/delete")
   public R delete(@RequestParam(name="id",required=true) String id) {
       return R.data(callNotFillRecordService.removeById(id));
   }

   /**
    * 批量删除
    *
    * @param ids
    * @return
    */
   @ApiOperation(value="外呼未接信息填报记录-批量删除", notes="外呼未接信息填报记录-批量删除")
   @PostMapping(value = "/deleteBatch")
   public R deleteBatch(@RequestParam(name="ids",required=true) String ids) {
       return R.data(this.callNotFillRecordService.removeByIds(Arrays.asList(ids.split(","))));
   }

   /**
    * 通过id查询
    *
    * @param id
    * @return
    */
   @ApiOperation(value="外呼未接信息填报记录-通过id查询", notes="外呼未接信息填报记录-通过id查询")
   @GetMapping(value = "/queryById")
   public R queryById(@RequestParam(name="id",required=true) String id) {
       CallNotFillRecord callNotFillRecord = callNotFillRecordService.getById(id);
       return R.data(callNotFillRecord);
   }

}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.java

New file
@@ -0,0 +1,25 @@
package cn.gistack.sm.intelligentCall.mapper;

import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.vo.CallNotFillRecordVO;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * @author zhongrj
 * @date 2023-06-13
 */
public interface CallNotFillRecordMapper extends BaseMapper<CallNotFillRecord> {

    /**
     * 自定义分页列表查询
     * @param page
     * @param callNotFillRecord
     * @return
     */
    List<CallNotFillRecordVO> selectCallNotFillRecordPage(@Param("page")IPage<CallNotFillRecordVO> page,
                                                          @Param("callNotFillRecord")CallNotFillRecordVO callNotFillRecord);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/mapper/CallNotFillRecordMapper.xml

New file
@@ -0,0 +1,12 @@
<?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.intelligentCall.mapper.CallNotFillRecordMapper">

    <!--自定义分页列表查询-->
    <select id="selectCallNotFillRecordPage" resultType="cn.gistack.sm.intelligentCall.vo.CallNotFillRecordVO">
        select * from sm_call_not_fill_record
        where 1=1
        order by id desc
    </select>

</mapper>

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/ICallNotFillRecordService.java

New file
@@ -0,0 +1,21 @@
package cn.gistack.sm.intelligentCall.service;

import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.vo.CallNotFillRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * @author zhongrj
 * @date 2023-06-13
 */
public interface ICallNotFillRecordService extends IService<CallNotFillRecord> {

    /**
     * 自定义分页列表查询
     * @param page
     * @param callNotFillRecord
     * @return
     */
    IPage<CallNotFillRecordVO> selectCallNotFillRecordPage(IPage<CallNotFillRecordVO> page, CallNotFillRecordVO callNotFillRecord);
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/intelligentCall/service/impl/CallNotFillRecordServiceImpl.java

New file
@@ -0,0 +1,28 @@
package cn.gistack.sm.intelligentCall.service.impl;

import cn.gistack.sm.intelligentCall.entity.CallNotFillRecord;
import cn.gistack.sm.intelligentCall.mapper.CallNotFillRecordMapper;
import cn.gistack.sm.intelligentCall.service.ICallNotFillRecordService;
import cn.gistack.sm.intelligentCall.vo.CallNotFillRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

/**
 * @author zhongrj
 * @date 2023-06-13
 */
@Service
public class CallNotFillRecordServiceImpl extends ServiceImpl<CallNotFillRecordMapper, CallNotFillRecord> implements ICallNotFillRecordService{

    /**
     * 自定义分页列表查询
     * @param page
     * @param callNotFillRecord
     * @return
     */
    @Override
    public IPage<CallNotFillRecordVO> selectCallNotFillRecordPage(IPage<CallNotFillRecordVO> page, CallNotFillRecordVO callNotFillRecord) {
        return page.setRecords(baseMapper.selectCallNotFillRecordPage(page,callNotFillRecord));
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResFlseLimServiceImpl.java

@@ -1,10 +1,12 @@
package cn.gistack.sm.sjztmd.service.impl;


import cn.gistack.sm.sjztmd.entity.AttResDangerManageSpecial;
import cn.gistack.sm.sjztmd.entity.AttResFlseLim;
import cn.gistack.sm.sjztmd.entity.AttResStagChar;
import cn.gistack.sm.sjztmd.entity.AttResWaterBlock;
import cn.gistack.sm.sjztmd.mapper.AttResFlseLimMapper;
import cn.gistack.sm.sjztmd.service.IAttResDangerManageSpecialService;
import cn.gistack.sm.sjztmd.service.IAttResFlseLimService;
import cn.gistack.sm.sjztmd.service.IAttResStagCharService;
import cn.gistack.sm.sjztmd.service.IAttResWaterBlockService;
@@ -38,6 +40,9 @@

    @Autowired
    private IAttResWaterBlockService attResWaterBlockService;

    @Autowired
    private IAttResDangerManageSpecialService attResDangerManageSpecialService;

    @Autowired
    private IUserClient userClient;
@@ -140,6 +145,14 @@
            attResWaterBlockService.updateAttResWaterBlockByResId(resWaterBlock);
        }

        // 修改控制运行水位
        if (StringUtil.isNotBlank(editResInfoVO.getTbControlZ())) {
            AttResDangerManageSpecial attResDangerManageSpecial = new AttResDangerManageSpecial();
            attResDangerManageSpecial.setResGuid(editResInfoVO.getResGuid());
            attResDangerManageSpecial.setTbControlZ(editResInfoVO.getTbControlZ());
            attResDangerManageSpecialService.updateAttResDangerManageSpecialByResId(attResDangerManageSpecial);
        }

        return attResStagCharService.customizeUpdateByGuid(attResStagChar);
    }
}

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/EditResInfoVO.java

@@ -79,6 +79,12 @@
    private String tbDamTopElevation;

    /**
     * 控制运行水位(米)
     */
    @ApiModelProperty(value = "控制运行水位(米)")
    private String tbControlZ;

    /**
     * 填报前汛期
     */
    private AttResFlseLim xqswObjQ;