no更新和导出..

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDeathDTO.java

@@ -137,4 +137,6 @@ public class DataSyncRecordDeathDTO implements Serializable {
      */
 	private Date updatedTime;
 
+    private String gridName;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/DataSyncRecordDeathPageFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.dto.form.dataSync;
+
+import com.epmet.commons.tools.dto.form.PageFormDTO;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author yzm
+ * @Date 2022/10/13 14:16
+ */
+@Data
+public class DataSyncRecordDeathPageFormDTO extends PageFormDTO {
+    /**
+     * 姓名
+     */
+    private String name;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    private String customerId;
+    /**
+     * 当前工作人员id
+     */
+    private String staffId;
+    /**
+     * 当前工作人员所属组织id
+     */
+    private String agencyId;
+}
+

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/DataSyncRecordDeathController.java

@@ -1,19 +1,17 @@
 package com.epmet.controller;
 
-import com.epmet.commons.tools.aop.NoRepeatSubmit;
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.commons.tools.validator.AssertUtils;
-import com.epmet.commons.tools.validator.ValidatorUtils;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.DataSyncRecordDeathDTO;
+import com.epmet.dto.form.dataSync.DataSyncRecordDeathPageFormDTO;
 import com.epmet.service.DataSyncRecordDeathService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.Map;
+import java.util.List;
 
 
 /**
@@ -29,40 +27,41 @@ public class DataSyncRecordDeathController {
     @Autowired
     private DataSyncRecordDeathService dataSyncRecordDeathService;
 
+    /**
+     * 列表
+     * @param formDTO
+     * @return
+     */
     @RequestMapping("page")
-    public Result<PageData<DataSyncRecordDeathDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<DataSyncRecordDeathDTO>> page(@LoginUser TokenDto tokenDto, @RequestParam DataSyncRecordDeathPageFormDTO formDTO){
-        PageData<DataSyncRecordDeathDTO> page = dataSyncRecordDeathService.page(params);
+        formDTO.setStaffId(tokenDto.getUserId());
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        PageData<DataSyncRecordDeathDTO> page = dataSyncRecordDeathService.page(formDTO);
         return new Result<PageData<DataSyncRecordDeathDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    /**
+     * 查看详情-带网格名称
+     * @param id
+     * @return
+     */
+    @PostMapping(value = "detail/{id}")
     public Result<DataSyncRecordDeathDTO> get(@PathVariable("id") String id){
         DataSyncRecordDeathDTO data = dataSyncRecordDeathService.get(id);
         return new Result<DataSyncRecordDeathDTO>().ok(data);
     }
 
-    @NoRepeatSubmit
+    /**
-    @PostMapping("save")
+     * 批量删除
-    public Result save(@RequestBody DataSyncRecordDeathDTO dto){
+     *
-        //效验数据
+     * @param ids
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+     * @return
-        dataSyncRecordDeathService.save(dto);
+     */
-        return new Result();
-    }
-
-    @NoRepeatSubmit
-    @PostMapping("update")
-    public Result update(@RequestBody DataSyncRecordDeathDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        dataSyncRecordDeathService.update(dto);
-        return new Result();
-    }
-
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody List<String> ids) {
-        //效验数据
+        if (CollectionUtils.isEmpty(ids)) {
-        AssertUtils.isArrayEmpty(ids, "id");
+            return new Result();
+        }
         dataSyncRecordDeathService.delete(ids);
         return new Result();
     }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncRecordDeathDao.java

@@ -1,8 +1,12 @@
 package com.epmet.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dto.DataSyncRecordDeathDTO;
 import com.epmet.entity.DataSyncRecordDeathEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 数据同步记录-居民死亡信息
@@ -12,5 +16,17 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface DataSyncRecordDeathDao extends BaseDao<DataSyncRecordDeathEntity> {
-	
+    /**
+     * 列表查询
+     *
+     * @param customerId
+     * @param idCard
+     * @param name
+     * @param agencyId
+     * @return
+     */
+    List<DataSyncRecordDeathDTO> pageSelect(@Param("customerId") String customerId,
+                                            @Param("idCard") String idCard,
+                                            @Param("name") String name,
+                                            @Param("agencyId") String agencyId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/DataSyncRecordDeathService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.DataSyncRecordDeathDTO;
+import com.epmet.dto.form.dataSync.DataSyncRecordDeathPageFormDTO;
 import com.epmet.entity.DataSyncRecordDeathEntity;
 
 import java.util.List;
@@ -20,12 +21,12 @@ public interface DataSyncRecordDeathService extends BaseService<DataSyncRecordDe
     /**
      * 默认分页
      *
-     * @param params
+     * @param formDTO
      * @return PageData<DataSyncRecordDeathDTO>
      * @author generator
      * @date 2022-10-11
      */
-    PageData<DataSyncRecordDeathDTO> page(Map<String, Object> params);
+    PageData<DataSyncRecordDeathDTO> page(DataSyncRecordDeathPageFormDTO formDTO);
 
     /**
      * 默认查询
@@ -47,26 +48,6 @@ public interface DataSyncRecordDeathService extends BaseService<DataSyncRecordDe
      */
     DataSyncRecordDeathDTO get(String id);
 
-    /**
-     * 默认保存
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-10-11
-     */
-    void save(DataSyncRecordDeathDTO dto);
-
-    /**
-     * 默认更新
-     *
-     * @param dto
-     * @return void
-     * @author generator
-     * @date 2022-10-11
-     */
-    void update(DataSyncRecordDeathDTO dto);
-
     /**
      * 批量删除
      *
@@ -75,7 +56,7 @@ public interface DataSyncRecordDeathService extends BaseService<DataSyncRecordDe
      * @author generator
      * @date 2022-10-11
      */
-    void delete(String[] ids);
+    void delete(List<String> ids);
 
     DataSyncRecordDeathDTO selectOne(LambdaQueryWrapper<DataSyncRecordDeathEntity> queryWrapper);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java

@@ -2,20 +2,26 @@ package com.epmet.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.page.PageData;
+import com.epmet.commons.tools.redis.common.CustomerOrgRedis;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.redis.common.bean.GridInfoCache;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.DataSyncRecordDeathDao;
 import com.epmet.dto.DataSyncRecordDeathDTO;
+import com.epmet.dto.form.dataSync.DataSyncRecordDeathPageFormDTO;
 import com.epmet.entity.DataSyncRecordDeathEntity;
 import com.epmet.service.DataSyncRecordDeathService;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -28,13 +34,19 @@ import java.util.Map;
 @Service
 public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl<DataSyncRecordDeathDao, DataSyncRecordDeathEntity> implements DataSyncRecordDeathService {
 
+    /**
+     * 列表查询
+     * @param formDTO
+     * @return
+     */
     @Override
-    public PageData<DataSyncRecordDeathDTO> page(Map<String, Object> params) {
+    public PageData<DataSyncRecordDeathDTO> page(DataSyncRecordDeathPageFormDTO formDTO) {
-        IPage<DataSyncRecordDeathEntity> page = baseDao.selectPage(
+        CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-                getPage(params, FieldConstant.CREATED_TIME, false),
+        formDTO.setAgencyId(null != staffInfoCacheResult ? staffInfoCacheResult.getAgencyId() : null);
-                getWrapper(params)
+        PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
-        );
+        List<DataSyncRecordDeathDTO> records = baseDao.pageSelect(formDTO.getCustomerId(),formDTO.getIdCard(), formDTO.getName(), formDTO.getAgencyId());
-        return getPageData(page, DataSyncRecordDeathDTO.class);
+        PageInfo<DataSyncRecordDeathDTO> pi = new PageInfo<>(records);
+        return new PageData<>(records, pi.getTotal());
     }
 
     @Override
@@ -53,31 +65,32 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl<DataSyncReco
         return wrapper;
     }
 
+    /**
+     * 返回详情:带网格名称
+     *
+     * @param id
+     * @return
+     */
     @Override
     public DataSyncRecordDeathDTO get(String id) {
         DataSyncRecordDeathEntity entity = baseDao.selectById(id);
-        return ConvertUtils.sourceToTarget(entity, DataSyncRecordDeathDTO.class);
+        DataSyncRecordDeathDTO recordDeathDTO = ConvertUtils.sourceToTarget(entity, DataSyncRecordDeathDTO.class);
-    }
+        if (StringUtils.isNotBlank(recordDeathDTO.getGridId())) {
-
+            GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(entity.getGridId());
-    @Override
+            recordDeathDTO.setGridName(null != gridInfoCache ? gridInfoCache.getGridNamePath() : StrConstant.EPMETY_STR);
-    @Transactional(rollbackFor = Exception.class)
+        }
-    public void save(DataSyncRecordDeathDTO dto) {
+        return recordDeathDTO;
-        DataSyncRecordDeathEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordDeathEntity.class);
-        insert(entity);
-    }
-
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public void update(DataSyncRecordDeathDTO dto) {
-        DataSyncRecordDeathEntity entity = ConvertUtils.sourceToTarget(dto, DataSyncRecordDeathEntity.class);
-        updateById(entity);
     }
 
+    /**
+     * 批量删除
+     * @param ids
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
+    public void delete(List<String> ids) {
         // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+        baseDao.deleteBatchIds(ids);
     }
 
     @Override

epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml

@@ -30,5 +30,32 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
 
-
+    <select id="pageSelect" parameterType="map" resultType="com.epmet.dto.DataSyncRecordDeathDTO">
+        SELECT
+            d.id,
+            d.`NAME`,
+            d.ID_CARD,
+            d.DEATH_DATE,
+            d.AGE,
+            d.ADDRESS,
+            d.IC_RESI_USER_ID,
+            d.GRID_ID,
+            d.AGENCY_ID
+        FROM
+            data_sync_record_death d
+        WHERE
+            d.DEL_FLAG = '0'
+          AND d.CUSTOMER_ID = #{customerId}
+        <if test="agencyId != null and agencyId != ''">
+            AND d.PIDS LIKE concat( '%', #{agencyId}, '%' )
+        </if>
+        <if test="idCard != null and idCard != ''">
+            AND d.ID_CARD LIKE concat('%',#{idCard},'%')
+        </if>
+        <if test="name != null and name != ''">
+            AND d.`NAME` LIKE concat('%',#{name},'%')
+        </if>
+        ORDER BY
+            d.CREATED_TIME DESC
+    </select>
 </mapper>