Merge remote-tracking branch 'origin/develop_dl' into develop_dl

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/DynamicLabelEnum.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+/**
+ * @author
+ * @title: EquipQrcodeColorEnum
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2020/12/12 14:23
+ */
+@Getter
+@AllArgsConstructor
+public enum DynamicLabelEnum {
+
+    NAME("name","姓名"),
+    CODE("personNumber","员工编码"),
+    BIZORGNAME("bizOrgName","所属单位"),
+    PERSONTYPE("peopleType","人员类型"),
+    TELPHONE("mobilePhone","联系电话"),
+    SEX("gender", "性别"),
+    CARDTYPE("certificatesType","证件类型"),
+    CARDNUM("certificatesNumber","证件号码"),
+    GWLX("jobTitle","岗位类型"),
+    GWZZ("postQualification","岗位资质"),
+    XFGLGW("fireManagementPost","消防管理岗位"),
+    GLZH("amosName","关联账户"),
+    GWZT("state","岗位状态"),
+    DISPDATE("birthdayTime","出生日期");
+
+    private String code;
+
+    private String describe;
+
+    public static DynamicLabelEnum getEnumByKey(String key) {
+        DynamicLabelEnum colorEnum = null;
+        for (DynamicLabelEnum u : DynamicLabelEnum.values()) {
+            if (u.getCode().equals(key)) {
+                colorEnum = u;
+                break;
+            }
+        }
+        return colorEnum;
+    }
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RiskBizInfoVo.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author keyong
+ * @title: RiskBizInfoVo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/5/17 11:22
+ */
+@Data
+public class RiskBizInfoVo {
+
+    private String warningObjectName;
+
+    private String warningObjectCode;
+
+    private String warningTime;
+
+    private String sourceAttribution;
+
+    private String sourceAttributionDesc;
+
+    private List<RiskDynamicDetailsVo> dynamicDetails;
+
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/RiskDynamicDetailsVo.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author keyong
+ * @title: RiskDynamicDetailsVo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/5/17 11:36
+ */
+@Data
+public class RiskDynamicDetailsVo {
+
+    private String tabName;
+
+    private List<TableContentVo> tabContent;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/TableContentVo.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import lombok.Data;
+
+/**
+ * @author keyong
+ * @title: TableContentVo
+ * <pre>
+ * @description: TODO
+ * </pre>
+ * @date 2023/5/17 11:20
+ */
+@Data
+public class TableContentVo {
+
+    private String key;
+
+    private String label;
+
+    private Object value;
+
+    private String type;
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -152,5 +152,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     List<OrgUsr> companyUserTreeByUserAndTypeALL(@Param("bizorgcode") String bizorgcode);
 
+    void updatePersonStatus(String status, String id);
+
     List<Map<String, Object>> getFireProtectionAndMaintenance();
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -353,6 +353,15 @@ public interface IOrgUsrService {
     PeopleInfoDto selectPeopleById(Long id);
 
     /**
+     * 获取人员详情 不要权限
+     * @param id 人员id
+     * @return 人员
+     */
+    PeopleInfoDto selectPeopleByIdNoAuth(Long id);
+
+
+
+    /**
      * 根据id，type删除
      * @param id 主键
      * @param type 类型
@@ -383,4 +392,8 @@ public interface IOrgUsrService {
 
     List<FirefightersPost> selectPostById(List<String> ids);
 
+    RiskBizInfoVo getPersonInfo(String id,String type);
+
+    void updatePersonStatus(String status, String id);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -858,8 +858,11 @@ GROUP BY
      WHERE biz_org_code like concat(#{code}, '%');
 
     </update>
+    <update id="updatePersonStatus">
+        update cb_org_usr set person_status = #{status} where id = #{id}
+    </update>
 
-  <select id ='getPersonSimpleDetail' resultType='Map'>
+    <select id ='getPersonSimpleDetail' resultType='Map'>
   SELECT
 	person.biz_org_name as name,
 	cdf.field_value as phone

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/RiskController.java

+package com.yeejoin.amos.boot.module.jcs.biz.controller;
+
+
+import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+@Api(tags = "风险相关")
+@RestController
+@RequestMapping("/riskSource")
+public class RiskController {
+
+    @Autowired
+    private IOrgUsrService orgUsrService;
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "获取人员信息详情发送至风险", notes = "获取人员信息详情发送至风险")
+    @RequestMapping(value = "/risk/person/detail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel getPersonDetailById(@RequestParam(value = "source") String source,
+                                                 @RequestParam(value = "id") String id
+                                                ) {
+        return CommonResponseUtil.success(orgUsrService.getPersonInfo(id,source));
+    }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @ApiOperation(value = "人员附码状态回显", notes = "人员附码状态回显")
+    @RequestMapping(value = "/update/person/status", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
+    public ResponseModel updatePersonStatus(@RequestParam(value = "status") String status,
+                                             @RequestParam(value = "id") String id
+    ) {
+        orgUsrService.updatePersonStatus(status,id);
+        return CommonResponseUtil.success();
+    }
+
+}