skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/controller/TbResGeneralInvestigationController.java
New file @@ -0,0 +1,78 @@ package cn.gistack.sm.sjztmd.controller; import cn.gistack.sm.sjztmd.entity.AttResBase; import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigation; import cn.gistack.sm.sjztmd.service.IAttResBaseService; import cn.gistack.sm.sjztmd.service.ITbResGeneralInvestigationService; import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO; import cn.gistack.sm.sjztmd.wrapper.AttResBaseWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiParam; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.StringUtil; import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.util.Date; import java.util.Map; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: * @USER: aix * @DATE: 2024/1/3 14:39 */ @Slf4j @Api(tags = "白蚁普查") @RestController @RequestMapping("/sjztmd/tbresgeneralinvestigation") @AllArgsConstructor public class TbResGeneralInvestigationController { private ITbResGeneralInvestigationService tbResGeneralInvestigationService; private IAttResBaseService attResBaseService; @ApiOperation(value = "中台水库-分页列表查询", notes = "中台水库-分页列表查询") @GetMapping(value = "/queryPageResList") public R queryPageResList(AttResBaseGeneralInvestigationVO attResBase, Query query) { IPage<AttResBaseGeneralInvestigationVO> pageList = attResBaseService.selectAttResBaseGeneralInvestigation(Condition.getPage(query), attResBase); return R.data(pageList); } @GetMapping("/list") @ApiOperation(value = "分页", notes = "白蚁普查分页") public R list(@ApiIgnore TbResGeneralInvestigation param, Query query) { QueryWrapper queryWrapper = new QueryWrapper(); if (null != param.getCheckState()) queryWrapper.eq("\"check_state\"", param.getCheckState()); if (!StringUtil.isBlank(param.getResName())) queryWrapper.like("\"res_name\"", param.getResName()); if (!StringUtil.isBlank(param.getResGuid())) queryWrapper.like("\"res_guid\"", param.getResGuid()); return R.data(tbResGeneralInvestigationService.page(Condition.getPage(query), queryWrapper)); } @ApiOperation(value = "白蚁普查-添加或者修改", notes = "白蚁普查-添加或者修改") @PostMapping(value = "/submit") public R submit(@RequestBody TbResGeneralInvestigation tbResGeneralInvestigation) { if (tbResGeneralInvestigation.getGuid() == null) { tbResGeneralInvestigation.setCreateTime(new Date()); } return R.status(tbResGeneralInvestigationService.saveOrUpdate(tbResGeneralInvestigation)); } @PostMapping("/remove") @ApiOperation(value = "物理删除", notes = "传入id") public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String id) { return R.status(tbResGeneralInvestigationService.removeById(id)); } } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/entity/TbResGeneralInvestigation.java
New file @@ -0,0 +1,178 @@ package cn.gistack.sm.sjztmd.entity; import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.util.Date; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: 白蚁普查 * @USER: aix * @DATE: 2024/1/3 14:02 */ @Data @TableName(value = "\"tb_res_general_investigation\"", autoResultMap = true) @ApiModel(value = "水库白蚁普查填报", description = "水库白蚁普查填报") public class TbResGeneralInvestigation implements Serializable { private static final long serialVersionUID = 1L; /** * 主键 */ @JsonSerialize(using = ToStringSerializer.class) @ApiModelProperty(value = "主键") @TableId(value = "\"guid\"", type = IdType.ASSIGN_ID) private String guid; /** * 水库编码 */ @ApiModelProperty(value = "水库编码") @TableField(value = "\"res_guid\"", fill = FieldFill.UPDATE) private String resGuid; /** * 水库名称 */ @ApiModelProperty(value = "水库名称") @TableField(value = "\"res_name\"", fill = FieldFill.UPDATE) private String resName; /** * 普查种类 */ @ApiModelProperty(value = "普查种类(白蚁、獾、狐、鼠等)") @TableField(value = "\"investigation_variety\"", fill = FieldFill.UPDATE) private String investigationVariety; /** * 是否蚁患 */ @ApiModelProperty(value = "是否蚁患") @TableField(value = "\"is_ant_infestation\"", fill = FieldFill.UPDATE) private String isAntInfestation; /** * 是否蚁源 */ @ApiModelProperty(value = "是否蚁源") @TableField(value = "\"is_ant_source\"", fill = FieldFill.UPDATE) private String isAntSource; /** * 部位 */ @ApiModelProperty(value = "部位") @TableField(value = "\"part_place\"", fill = FieldFill.UPDATE) private String partPlace; /** * 普查面积 */ @ApiModelProperty(value = "普查面积") @TableField(value = "\"investigation_area\"", fill = FieldFill.UPDATE) private String investigationArea; /** * 普查类型 */ @ApiModelProperty(value = "普查类型") @TableField(value = "\"investigation_type\"", fill = FieldFill.UPDATE) private String investigationType; /** * 普查方式 */ @ApiModelProperty(value = "普查方式") @TableField(value = "\"investigation_way\"", fill = FieldFill.UPDATE) private String investigationWay; /** * 危害等级 */ @ApiModelProperty(value = "危害等级") @TableField(value = "\"hazard_rating\"", fill = FieldFill.UPDATE) private String hazardRating; /** * 白蚁活动迹象 */ @ApiModelProperty(value = "白蚁活动迹象") @TableField(value = "\"signs_of_termite_activity\"", fill = FieldFill.UPDATE) private String signsOfTermiteActivity; /** * 危害等级 */ @ApiModelProperty(value = "桩号") @TableField(value = "\"stake_mark\"", fill = FieldFill.UPDATE) private String stakeMark; /** * 危害等级 */ @ApiModelProperty(value = "是否致险情况") @TableField(value = "\"is_danger\"", fill = FieldFill.UPDATE) private String isDanger; /** * 致险情况详情 */ @ApiModelProperty(value = "致险情况详情") @TableField(value = "\"danger_info\"", fill = FieldFill.UPDATE, typeHandler = FastjsonTypeHandler.class) private Object dangerInfo; /** * 图片数组 */ @ApiModelProperty(value = "图片数组") @TableField(value = "\"image_urls\"", fill = FieldFill.UPDATE, typeHandler = FastjsonTypeHandler.class) private Object imageUrls; /** * 视频数组 */ @ApiModelProperty(value = "视频数组") @TableField(value = "\"video_urls\"", fill = FieldFill.UPDATE, typeHandler = FastjsonTypeHandler.class) private Object videoUrls; /** * 经度 */ @ApiModelProperty(value = "经度") @TableField(value = "\"lon\"", fill = FieldFill.UPDATE) private String lon; /** * 纬度 */ @ApiModelProperty(value = "纬度") @TableField(value = "\"lat\"", fill = FieldFill.UPDATE) private String lat; /** * 填报状态（0:填写中，1:审核中，2:审核通过） */ @ApiModelProperty(value = "填报状态（0:填写中，1:审核中，2:审核通过） ") @TableField("\"check_state\"") @JsonSerialize(using = ToStringSerializer.class) private Integer checkState; /** * 创建时间 */ @ApiModelProperty(value = "创建时间 ") @TableField("\"create_time\"") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.java
@@ -3,6 +3,7 @@ import cn.gistack.sm.sjztmd.dto.AttResBaseUserDTO; import cn.gistack.sm.sjztmd.entity.AttResBase; import cn.gistack.sm.sjztmd.vo.AttResAdVO; import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO; import cn.gistack.sm.sjztmd.vo.AttResBaseVO; import cn.gistack.sm.sjztmd.vo.ManagePersonVO; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -21,6 +22,8 @@ List<AttResBase> selectAttResBasePage(IPage<AttResBase> page, @Param("attResBase") AttResBase attResBase); List<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, @Param("attResBase") AttResBaseGeneralInvestigationVO attResBase); List<AttResBase> getListByRegion(IPage<AttResBase> page,@Param("obj") Map<String, Object> obj); @@ -65,4 +68,5 @@ * @return */ int getDimResInfoACount(); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/AttResBaseMapper.xml
@@ -10,6 +10,35 @@ AND "name" LIKE CONCAT('%',#{attResBase.name},'%') </if> </select> <select id="selectAttResBaseGeneralInvestigation" resultType="cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO"> select * from ( select *, case when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and b."check_state" = 2) > 0 THEN '2' when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and b."check_state" = 1) > 0 THEN '1' when (select count(*) from sjzt_md."tb_res_general_investigation" b where a."guid" = b."res_guid" and b."check_state" = 0) > 0 THEN '0' ELSE '-1' END AS tb_state from sjzt_md."att_res_base" a ) a WHERE "is_deleted"=0 <if test="attResBase.name !=null and attResBase.name !=''"> AND "name" LIKE CONCAT('%',#{attResBase.name},'%') </if> <if test="attResBase.code !=null and attResBase.code !=''"> AND "code" LIKE CONCAT('%',#{attResBase.code},'%') </if> <if test="attResBase.resRegCode !=null and attResBase.resRegCode !=''"> AND "res_reg_code" LIKE CONCAT('%',#{attResBase.resRegCode},'%') </if> <if test="attResBase.tbState !=null and attResBase.tbState !=''"> AND tb_state = #{attResBase.tbState} </if> </select> <select id="getListByRegion" resultType="cn.gistack.sm.sjztmd.entity.AttResBase"> SELECT arb."guid",arb."code",arb."name",arb."ad_guid",arb."eng_scal",arb."res_loc" FROM "att_res_base" arb left join "att_ad_base" aab on aab."guid" = arb."interior_ad_guid" skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.java
New file @@ -0,0 +1,17 @@ package cn.gistack.sm.sjztmd.mapper; import cn.gistack.sm.sjztmd.entity.TbAttResBase; import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigation; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * AttResBaseMapper 接口 * * @author Chill */ public interface TbResGeneralInvestigationMapper extends BaseMapper<TbResGeneralInvestigation> { } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/mapper/TbResGeneralInvestigationMapper.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.sjztmd.mapper.TbResGeneralInvestigationMapper"> <!--namespace根据自己需要创建的的mapper的路径和名称填写--> </mapper> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/IAttResBaseService.java
@@ -5,6 +5,7 @@ import cn.gistack.sm.sjztmd.entity.AttResBase; import cn.gistack.sm.sjztmd.vo.AttAdBaseVO; import cn.gistack.sm.sjztmd.vo.AttResAdVO; import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO; import cn.gistack.sm.sjztmd.vo.AttResBaseVO; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; @@ -23,6 +24,8 @@ IPage<AttResBase> selectAttResBasePage(IPage<AttResBase> page, AttResBase attResBase); IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase); IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj); AttResBase getDetailByCode(String code); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/ITbResGeneralInvestigationService.java
New file @@ -0,0 +1,14 @@ package cn.gistack.sm.sjztmd.service; import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigation; import com.baomidou.mybatisplus.extension.service.IService; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: * @USER: aix * @DATE: 2024/1/3 14:35 */ public interface ITbResGeneralInvestigationService extends IService<TbResGeneralInvestigation> { } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/AttResBaseServiceImpl.java
@@ -6,6 +6,7 @@ import cn.gistack.sm.sjztmd.mapper.AttResBaseMapper; import cn.gistack.sm.sjztmd.service.IAttResBaseService; import cn.gistack.sm.sjztmd.vo.AttResAdVO; import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO; import cn.gistack.sm.sjztmd.vo.AttResBaseVO; import cn.gistack.sm.sjztmd.vo.ManagePersonVO; import com.baomidou.dynamic.datasource.annotation.DS; @@ -40,6 +41,11 @@ } @Override public IPage<AttResBaseGeneralInvestigationVO> selectAttResBaseGeneralInvestigation(IPage<AttResBaseGeneralInvestigationVO> page, AttResBaseGeneralInvestigationVO attResBase) { return page.setRecords(baseMapper.selectAttResBaseGeneralInvestigation(page,attResBase)); } @Override public IPage<AttResBase> getListByRegion(IPage<AttResBase> page,Map<String, Object> obj) { return page.setRecords(baseMapper.getListByRegion(page,obj)); } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/service/impl/TbResGeneralInvestigationServiceImpl.java
New file @@ -0,0 +1,22 @@ package cn.gistack.sm.sjztmd.service.impl; import cn.gistack.sm.sjztmd.entity.TbResGeneralInvestigation; import cn.gistack.sm.sjztmd.mapper.TbResGeneralInvestigationMapper; import cn.gistack.sm.sjztmd.service.ITbResGeneralInvestigationService; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: * @USER: aix * @DATE: 2024/1/3 14:36 */ @Service @DS("zt") @Transactional(rollbackFor = Exception.class) public class TbResGeneralInvestigationServiceImpl extends ServiceImpl<TbResGeneralInvestigationMapper, TbResGeneralInvestigation> implements ITbResGeneralInvestigationService { } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/vo/AttResBaseGeneralInvestigationVO.java
New file @@ -0,0 +1,17 @@ package cn.gistack.sm.sjztmd.vo; import cn.gistack.sm.sjztmd.entity.AttResBase; import lombok.Data; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: * @USER: aix * @DATE: 2024/1/3 15:30 */ @Data public class AttResBaseGeneralInvestigationVO extends AttResBase { private static final long serialVersionUID = 1L; private String tbState;//填报状态 } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sjztmd/wrapper/AttResBaseWrapper.java
New file @@ -0,0 +1,40 @@ package cn.gistack.sm.sjztmd.wrapper; import cn.gistack.sm.sjztmd.entity.AttResBase; import cn.gistack.sm.sjztmd.service.ITbResGeneralInvestigationService; import cn.gistack.sm.sjztmd.vo.AttResBaseGeneralInvestigationVO; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.springblade.core.mp.support.BaseEntityWrapper; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.SpringUtil; import java.util.List; import java.util.Objects; /** * @PROJECT_NAME: skjcmanager * @DESCRIPTION: * @USER: aix * @DATE: 2024/1/3 16:00 */ public class AttResBaseWrapper extends BaseEntityWrapper<AttResBase, AttResBaseGeneralInvestigationVO> { private static final ITbResGeneralInvestigationService tbResGeneralInvestigationService; static { tbResGeneralInvestigationService = SpringUtil.getBean(ITbResGeneralInvestigationService.class); } public static AttResBaseWrapper build() { return new AttResBaseWrapper(); } @Override public AttResBaseGeneralInvestigationVO entityVO(AttResBase entity) { AttResBaseGeneralInvestigationVO vo = Objects.requireNonNull(BeanUtil.copy(entity, AttResBaseGeneralInvestigationVO.class)); return vo; } }
