Merge remote-tracking branch 'origin/master'

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

@@ -41,6 +41,11 @@ public class MapInfoFormDTO implements Serializable {
      */
     private String name;
 
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
 
 
 }

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

@@ -1,5 +1,7 @@
 package com.epmet.controller;
 
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
@@ -33,9 +35,10 @@ public class IcPointAppController {
      * @return
      */
     @PostMapping("getMapInfoByPointType")
-    public Result<List<MapInfoResultDTO>> getMapInfoByPointType(@RequestBody MapInfoFormDTO formDTO){
+    public Result<List<MapInfoResultDTO>> getMapInfoByPointType(@RequestBody MapInfoFormDTO formDTO, @LoginUser TokenDto tokenDto){
         // 效验数据
         ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class);
+        formDTO.setCustomerId(tokenDto.getCustomerId());
 
         return icPointAppService.getMapInfoByPointType(formDTO);
     }

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

@@ -67,8 +67,9 @@ public class IcPointNucleicMonitoringController {
     private IcPointNucleicMonitoringDao icPointNucleicMonitoringDao;
 
     @RequestMapping("page")
-    public Result<PageData<IcPointNucleicMonitoringDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IcPointNucleicMonitoringDTO>> page(@RequestParam Map<String, Object> params, @LoginUser TokenDto tokenDto){
 //        PageData<IcPointNucleicMonitoringDTO> page = icPointNucleicMonitoringService.page(params);
+        params.put("customerId",tokenDto.getCustomerId());
         PageData<IcPointNucleicMonitoringDTO> page = icPointNucleicMonitoringService.getPhrasePage(params);
         return new Result<PageData<IcPointNucleicMonitoringDTO>>().ok(page);
     }

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

@@ -60,8 +60,9 @@ public class IcPointVaccinesInoculationController {
     private IcPointVaccinesInoculationDao icPointVaccinesInoculationDao;
 
     @RequestMapping("page")
-    public Result<PageData<IcPointVaccinesInoculationDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<IcPointVaccinesInoculationDTO>> page(@RequestParam Map<String, Object> params, @LoginUser TokenDto tokenDto){
 //        PageData<IcPointVaccinesInoculationDTO> page = icPointVaccinesInoculationService.page(params);
+        params.put("customerId",tokenDto.getCustomerId());
         PageData<IcPointVaccinesInoculationDTO> page = icPointVaccinesInoculationService.getPhrasePage(params);
         return new Result<PageData<IcPointVaccinesInoculationDTO>>().ok(page);
     }
@@ -74,18 +75,20 @@ public class IcPointVaccinesInoculationController {
 
     @NoRepeatSubmit
     @PostMapping()
-    public Result save(@RequestBody IcPointVaccinesInoculationDTO dto){
+    public Result save(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
         icPointVaccinesInoculationService.save(dto);
         return new Result();
     }
 
     @NoRepeatSubmit
     @PutMapping()
-    public Result update(@RequestBody IcPointVaccinesInoculationDTO dto){
+    public Result update(@RequestBody IcPointVaccinesInoculationDTO dto, @LoginUser TokenDto tokenDto){
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+        dto.setCustomerId(tokenDto.getCustomerId());
         icPointVaccinesInoculationService.update(dto);
         return new Result();
     }

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

@@ -25,8 +25,8 @@ public interface IcPointNucleicMonitoringDao extends BaseDao<IcPointNucleicMonit
      * 获取所有地点名称
      * @return
      */
-    List<String> getAllAddressName();
+    List<String> getAllAddressName(@Param("customerId") String customerId);
-    List<String> getAllAddressNameNoCurrent(@Param("id") String id);
+    List<String> getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id);
 
     /**
      * 条件查询

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

@@ -7,6 +7,7 @@ import com.epmet.dto.form.PointHSYMFormDTO;
 import com.epmet.dto.result.MapInfoResultDTO;
 import com.epmet.entity.IcPointVaccinesInoculationEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -24,7 +25,8 @@ public interface IcPointVaccinesInoculationDao extends BaseDao<IcPointVaccinesIn
      * 获取所有地点名称
      * @return
      */
-    List<String> getAllAddressName();
+    List<String> getAllAddressName(@Param("customerId") String customerId);
+    List<String> getAllAddressNameNoCurrent(@Param("customerId") String customerId,@Param("id") String id);
 
     /**
      * 条件查询

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

@@ -127,7 +127,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPoint
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPointNucleicMonitoringDTO dto) {
         // 获取所有地点名称
-        List<String> addressList = baseDao.getAllAddressName();
+        List<String> addressList = baseDao.getAllAddressName(dto.getCustomerId());
         // 校验数据库是否存在该地点名称
         if (addressList.contains(dto.getName())){
             throw new RenException("该监测点名称已存在，请重新输入");
@@ -148,7 +148,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPoint
     @Transactional(rollbackFor = Exception.class)
     public void update(IcPointNucleicMonitoringDTO dto) {
         // 获取所有地点名称
-        List<String> addressList = baseDao.getAllAddressNameNoCurrent(dto.getId());
+        List<String> addressList = baseDao.getAllAddressNameNoCurrent(dto.getCustomerId(),dto.getId());
         // 校验数据库是否存在该地点名称
         if (addressList.contains(dto.getName())){
             throw new RenException("该监测点名称已存在，请重新输入");
@@ -200,7 +200,7 @@ public class IcPointNucleicMonitoringServiceImpl extends BaseServiceImpl<IcPoint
                 throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId());
             }
             // 获取所有地点名称
-            List<String> addressList = baseDao.getAllAddressName();
+            List<String> addressList = baseDao.getAllAddressName(tokenDto.getUserId());
             for (int i = 0; i < list.size(); i++) {
                 list.get(i).setNum(i+1);
                 if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){

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

@@ -123,7 +123,7 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl<IcPoi
     @Transactional(rollbackFor = Exception.class)
     public void save(IcPointVaccinesInoculationDTO dto) {
         // 获取所有地点名称
-        List<String> addressList = baseDao.getAllAddressName();
+        List<String> addressList = baseDao.getAllAddressName(dto.getCustomerId());
         // 校验数据库是否存在该地点名称
         if (addressList.contains(dto.getName())){
             throw new RenException("该接种点名称已存在，请重新输入");
@@ -135,6 +135,12 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl<IcPoi
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(IcPointVaccinesInoculationDTO dto) {
+        // 获取所有地点名称
+        List<String> addressList = baseDao.getAllAddressNameNoCurrent(dto.getCustomerId(),dto.getId());
+        // 校验数据库是否存在该地点名称
+        if (addressList.contains(dto.getName())){
+            throw new RenException("该接种点名称已存在，请重新输入");
+        }
         IcPointVaccinesInoculationEntity entity = ConvertUtils.sourceToTarget(dto, IcPointVaccinesInoculationEntity.class);
         updateById(entity);
     }
@@ -174,7 +180,7 @@ public class IcPointVaccinesInoculationServiceImpl extends BaseServiceImpl<IcPoi
                 throw new EpmetException("未查询到组织信息"+staffInfo.getAgencyId());
             }
             // 获取所有地点名称
-            List<String> addressList = baseDao.getAllAddressName();
+            List<String> addressList = baseDao.getAllAddressName(tokenDto.getCustomerId());
             for (int i = 0; i < list.size(); i++) {
                 list.get(i).setNum(i+1);
 //                if (StringUtils.isBlank(list.get(i).getOrgName()) && !list.get(i).getAddStatus()){

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

@@ -29,6 +29,7 @@
         NAME
         from ic_point_nucleic_monitoring
         where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
     </select>
 
     <select id="getAllAddressNameNoCurrent" resultType="java.lang.String">
@@ -37,6 +38,7 @@
         from ic_point_nucleic_monitoring
         where DEL_FLAG = 0
         and ID != #{id}
+        and CUSTOMER_ID = #{customerId}
     </select>
 
     <select id="getPhrasePage" resultType="com.epmet.dto.IcPointNucleicMonitoringDTO">
@@ -61,6 +63,7 @@
         UPDATED_TIME
         from ic_point_nucleic_monitoring
         where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
         <if test="name != null and name != ''">
             and NAME like CONCAT('%' ,#{name}, '%')
         </if>
@@ -124,6 +127,7 @@
         LATITUDE
         from ic_point_nucleic_monitoring
         where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
         <if test="name != null and name != ''">
             and NAME like CONCAT('%' ,#{name}, '%')
         </if>

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

@@ -34,6 +34,16 @@
         NAME
         from ic_point_vaccines_inoculation
         where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
+    </select>
+
+    <select id="getAllAddressNameNoCurrent" resultType="java.lang.String">
+        select
+        NAME
+        from ic_point_vaccines_inoculation
+        where DEL_FLAG = 0
+        and ID != #{id}
+        and CUSTOMER_ID = #{customerId}
     </select>
 
     <select id="getPhrasePage" resultType="com.epmet.dto.IcPointVaccinesInoculationDTO">
@@ -63,6 +73,7 @@
         UPDATED_TIME
         from ic_point_vaccines_inoculation
         where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
         <if test="name != null and name != ''">
             and NAME like CONCAT('%' ,#{name}, '%')
         </if>
@@ -128,6 +139,7 @@
         LATITUDE
         from ic_point_vaccines_inoculation
         where DEL_FLAG = 0
+        and CUSTOMER_ID = #{customerId}
         <if test="name != null and name != ''">
             and NAME like CONCAT('%' ,#{name}, '%')
         </if>