emm

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcEmployeeRegisterDTO.java

@@ -2,8 +2,13 @@ package com.epmet.dto;
 
 import java.io.Serializable;
 import java.util.Date;
+
+import com.epmet.commons.tools.validator.group.AddGroup;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 
 /**
  * 员工登记表
@@ -24,28 +29,39 @@ public class IcEmployeeRegisterDTO implements Serializable {
     /**
      * 客户id
      */
+    @NotBlank(message = "customerId不能为空",groups = {AddGroup.class})
 	private String customerId;
 
     /**
      * 场所id
      */
+    @NotBlank(message = "enterpriseId不能为空",groups = {AddGroup.class})
 	private String enterpriseId;
 
     /**
      * 姓名
      */
+    @NotBlank(message = "name不能为空",groups = {AddGroup.class})
 	private String name;
 
     /**
      * 手机号
      */
+    @NotBlank(message = "mobile不能为空",groups = {AddGroup.class})
 	private String mobile;
 
     /**
      * 身份证号或护照号
      */
+    @NotBlank(message = "idCard不能为空",groups = {AddGroup.class})
 	private String idCard;
 
+    @NotNull(message = "ymjzCount不能为空",groups = {AddGroup.class})
+    private Integer ymjzCount;
+
+    @NotNull(message = "latestNatTime不能为空",groups = {AddGroup.class})
+    private Date latestNatTime;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEmployeeRegisterController.java

@@ -37,14 +37,14 @@ public class IcEmployeeRegisterController {
         return new Result<PageData<IcEmployeeRegisterDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @PostMapping(value = "{id}")
     public Result<IcEmployeeRegisterDTO> get(@PathVariable("id") String id){
         IcEmployeeRegisterDTO data = icEmployeeRegisterService.get(id);
         return new Result<IcEmployeeRegisterDTO>().ok(data);
     }
 
     @NoRepeatSubmit
-    @PostMapping("save")
+    @PostMapping("add")
     public Result save(@RequestBody IcEmployeeRegisterDTO dto){
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -62,9 +62,7 @@ public class IcEmployeeRegisterController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
+    public Result delete(@RequestBody List<String> ids){
         icEmployeeRegisterService.delete(ids);
         return new Result();
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcGroupPeopleRegisterController.java

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcGroupPeopleRegisterDTO;
 import com.epmet.service.IcGroupPeopleRegisterService;
+import oracle.jdbc.proxy.annotation.Post;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -37,7 +38,7 @@ public class IcGroupPeopleRegisterController {
         return new Result<PageData<IcGroupPeopleRegisterDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
+    @PostMapping(value = "{id}")
     public Result<IcGroupPeopleRegisterDTO> get(@PathVariable("id") String id){
         IcGroupPeopleRegisterDTO data = icGroupPeopleRegisterService.get(id);
         return new Result<IcGroupPeopleRegisterDTO>().ok(data);
@@ -62,9 +63,7 @@ public class IcGroupPeopleRegisterController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
+    public Result delete(@RequestBody List<String> ids){
         icGroupPeopleRegisterService.delete(ids);
         return new Result();
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcEmployeeRegisterService.java

@@ -68,11 +68,10 @@ public interface IcEmployeeRegisterService extends BaseService<IcEmployeeRegiste
 
     /**
      * 批量删除
-     *
      * @param ids
      * @return void
      * @author generator
      * @date 2022-10-26
      */
-    void delete(String[] ids);
+    void delete(List<String> ids);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcGroupPeopleRegisterService.java

@@ -68,11 +68,10 @@ public interface IcGroupPeopleRegisterService extends BaseService<IcGroupPeopleR
 
     /**
      * 批量删除
-     *
      * @param ids
      * @return void
      * @author generator
      * @date 2022-10-26
      */
-    void delete(String[] ids);
+    void delete(List<String> ids);
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcEmployeeRegisterServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.dao.IcEmployeeRegisterDao;
 import com.epmet.dto.IcEmployeeRegisterDTO;
 import com.epmet.entity.IcEmployeeRegisterEntity;
 import com.epmet.service.IcEmployeeRegisterService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -63,6 +64,7 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeReg
     @Transactional(rollbackFor = Exception.class)
     public void save(IcEmployeeRegisterDTO dto) {
         IcEmployeeRegisterEntity entity = ConvertUtils.sourceToTarget(dto, IcEmployeeRegisterEntity.class);
+
         insert(entity);
     }
 
@@ -75,9 +77,10 @@ public class IcEmployeeRegisterServiceImpl extends BaseServiceImpl<IcEmployeeReg
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+    public void delete(List<String> ids) {
+        if (CollectionUtils.isNotEmpty(ids)){
+            baseDao.deleteBatchIds(ids);
+        }
     }
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcGroupPeopleRegisterServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.dao.IcGroupPeopleRegisterDao;
 import com.epmet.dto.IcGroupPeopleRegisterDTO;
 import com.epmet.entity.IcGroupPeopleRegisterEntity;
 import com.epmet.service.IcGroupPeopleRegisterService;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -75,9 +76,10 @@ public class IcGroupPeopleRegisterServiceImpl extends BaseServiceImpl<IcGroupPeo
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void delete(String[] ids) {
-        // 逻辑删除（@TableLogic 注解）
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+    public void delete(List<String> ids) {
+        if (CollectionUtils.isNotEmpty(ids)){
+            baseDao.deleteBatchIds(ids);
+        }
     }
 
 }