人员红黄码规则部分代码提交

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/Enum/QrcodeColorEnum.java

+package com.yeejoin.amos.boot.module.jxiop.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum QrcodeColorEnum {
+    GREEN("绿码", "green"),
+    RED("红码", "red"),
+    YELLOW("黄码", "yellow");
+
+
+    private String name;
+    private String code;
+
+    public static String getCode(String name) {
+
+        for (QrcodeColorEnum qrcodeColorEnum : QrcodeColorEnum.values()) {
+            if (qrcodeColorEnum.getName().equals(name)) {
+                return qrcodeColorEnum.getCode();
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/Enum/QrcodePostEnum.java

+package com.yeejoin.amos.boot.module.jxiop.api.Enum;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum QrcodePostEnum {
+    ZZ("站长", "登高证,调度证,高压电工证"),
+    FZZ("副站长", "登高证,调度证,高压电工证"),
+    JXBZ("检修班长", "登高证,高压电工证"),
+    JXY("检修员", "登高证,高压电工证"),
+    YWZZ("运维值长", "登高证,调度证,高压电工证"),
+    YWY("运维员", "登高证,调度证,高压电工证"),
+    CS("厨师", "健康证"),
+    AQY("安全员", "安全员证"),
+    SJ("司机", "驾照"),
+    XFY("消防员", "消防设施操作证");
+
+
+    private String name;
+    private String code;
+
+    public static String getCode(String name) {
+
+        for (QrcodePostEnum qrcodePostEnum : QrcodePostEnum.values()) {
+            if (qrcodePostEnum.getName().equals(name)) {
+                return qrcodePostEnum.getCode();
+            }
+        }
+        return null;
+    }
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/CertificationInfo.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonCertificate;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CertificationInfo {
+    private List<PersonCertificate> certificationInfo;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonDto.java

@@ -17,7 +17,8 @@ public class PersonDto {
     private PersonUser personUser;
 
     //资质信息
-    private PersonCertificate personCertificate;
+//    private CertificationInfo personCertificate;
+    private CertificationInfo personCertificate;
 
     //账户信息
     private PersonAccount personAccount;

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonBasic.java

@@ -150,4 +150,9 @@ public class PersonBasic extends BaseEntity {
     @TableField("post_name")
     private String postName;
 
+    /**
+     * 岗位
+     */
+    @TableField("qrcode_color")
+    private String qrcodeColor;
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/PersonBasicController.java

@@ -11,6 +11,8 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
 import org.springframework.web.bind.annotation.RestController;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+
+import java.text.ParseException;
 import java.util.List;
 import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.PersonBasicServiceImpl;
 import org.springframework.web.context.request.RequestContextHolder;
@@ -50,10 +52,9 @@ public class PersonBasicController extends BaseController {
 	@ApiOperation(httpMethod = "POST", value = "新增人员基本信息", notes = "新增人员基本信息")
 	public ResponseModel<Object> save(@RequestBody PersonDto model,HttpServletRequest httpServletRequest) {
 
-
 	    try {
-            personBasicServiceImpl.addPerson(model,httpServletRequest);
-        }catch (InnerInvokException e){
+            personBasicServiceImpl.addPerson(model, httpServletRequest);
+        }catch (InnerInvokException | ParseException e){
             e.printStackTrace();
             return  this.buildResponseFalse(e.getMessage());
         }
@@ -76,7 +77,7 @@ public class PersonBasicController extends BaseController {
 	public ResponseModel<PersonDto> updateBySequenceNbrPersonBasic(@RequestBody PersonDto model,@RequestParam(value = "sequenceNbr") Long sequenceNbr,HttpServletRequest httpServletRequest) {
         try {
 	    personBasicServiceImpl.updatePerson(model,httpServletRequest,sequenceNbr);
-        }catch (InnerInvokException e){
+        }catch (InnerInvokException | ParseException e){
             e.printStackTrace();
             return  this.buildResponseFalse(e.getMessage());
         }