Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonBasicMapper.java

@@ -64,4 +64,6 @@ public interface PersonBasicMapper extends BaseMapper<PersonBasic> {
                                      @Param("ne") String ne);
 
     List<StationQrCodeStatistics> getPersonStatistics();
+
+    Map<String, Object> getPersonDetailInfoByObjectId(String objectId);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonBasicMapper.xml

@@ -213,7 +213,8 @@
         ifnull(b.name, '') as objectName ,
         ifnull(a.qrcode_color, '') AS qrCodeColor,
         ifnull(c.station_name, '') AS stationName,
-        ifnull(a.rec_date, '') as recDate
+        ifnull(a.rec_date, '') as recDate,
+        a.sequence_nbr as objectId
         FROM
         person_basic a
         LEFT JOIN person_account b ON a.sequence_nbr = b.person_id
@@ -272,4 +273,20 @@
         GROUP BY
             project_org_code
     </select>
+
+    <select id="getPersonDetailInfoByObjectId" resultType="java.util.Map">
+        SELECT
+            IFNULL(b.`name`, '') as `name`,
+            IFNULL(a.phone, '') as phone,
+            IFNULL(a.post_name, '') as postName,
+            IFNULL(b.project_name, '') as stationName,
+            '' as unitName,
+            IFNULL(a.qrcode_color, 'green') as qrCodeColor
+        FROM
+            person_basic a
+                LEFT JOIN person_account b ON a.sequence_nbr = b.person_id
+                LEFT JOIN station_basic c ON a.project_org_code = c.project_org_code
+        where
+            a.sequence_nbr = #{objectId}
+    </select>
 </mapper>

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

@@ -313,4 +313,20 @@ public class PersonQrCodeController extends BaseController {
     }
 
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @GetMapping(value = "/getDetailInfoByObjectId")
+    @ApiOperation(httpMethod = "GET", value = "评估大屏 - 三级弹窗左侧信息API", notes = "评估大屏 - 三级弹窗左侧信息API")
+    public ResponseModel<Map<String, Object>> getDetailInfoByObjectId(@RequestParam(value = "objectId") String objectId,
+                                                                      @RequestParam(value = "column") String column) {
+        Map<String, Object> resultMap = new HashMap<>();
+        if ("V1".equals(column)) {
+            resultMap = personBasicServiceImpl.getPersonDetailInfoByObjectId(objectId);
+        } else if ("S1".equals(column)) {
+            resultMap = sjglZsjZsbtzMapper.getEquipDetailInfoByObjectId(objectId);
+        } else if ("P1".equals(column)) {
+            // TODO: 2023/9/1  任务sql未处理
+            resultMap = sjglZsjZsbtzMapper.getJobDetailInfoByObjectId(objectId);
+        }
+        return ResponseHelper.buildResponse(resultMap);
+    }
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/SjglZsjZsbtzMapper.java

@@ -87,4 +87,8 @@ public interface SjglZsjZsbtzMapper extends BaseMapper<SjglZsjZsbtz> {
                                   @Param("date") String date,
                                   @Param("qrCodeColor") String qrCodeColor,
                                   @Param("ne") String ne);
+
+    Map<String, Object> getEquipDetailInfoByObjectId(@Param("objectId") String objectId);
+
+    Map<String, Object> getJobDetailInfoByObjectId(@Param("objectId") String objectId);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -139,4 +139,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         mapPage.setTotal(count);
         return mapPage;
     }
+
+    public Map<String, Object> getPersonDetailInfoByObjectId(String objectId) {
+        Map<String, Object> resultMap = personBasicMapper.getPersonDetailInfoByObjectId(objectId);
+        return resultMap;
+    }
 }
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/mapper/cluster/SjglZsjZsbtzMapper.xml

@@ -102,7 +102,8 @@
         ifnull(a.SBMC, '') as objectName ,
         ifnull(a.QRCODE_COLOR, '') AS qrCodeColor,
         ifnull(b.COMPANY_NAME, '') AS stationName,
-        ifnull(a.UPDATE_TIME, '') as recDate
+        ifnull(a.UPDATE_TIME, '') as recDate,
+        SBBM as objectId
         FROM
         sjgl_zsj_zsbtz a
         LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE
@@ -151,7 +152,8 @@
         ifnull(a.JOB_DESCRIPTION, '') as objectName ,
         ifnull(a.qrcode_color, '') AS qrCodeColor,
         ifnull(b.COMPANY_NAME, '') AS stationName,
-        ifnull(a.CREATE_TIME, '') as recDate
+        ifnull(a.CREATE_TIME, '') as recDate,
+        GLDJBH AS objectId
         FROM
         fdgl_job_main a
         LEFT JOIN privilege_company b ON a.WERKS = b.COMPANY_CODE
@@ -194,4 +196,22 @@
             </if>
         </where>
     </select>
+
+    <select id="getEquipDetailInfoByObjectId" resultType="java.util.Map">
+        SELECT
+            IFNULL(`SBBM`, '') as `name`,
+            IFNULL(SBMC, '') as `code`,
+            IFNULL(GGXH, '') as typeCode,
+            IFNULL(SCCJ, '') as source,
+            '' as stationName,
+            IFNULL(QRCODE_COLOR, 'green') as qrCodeColor
+        FROM
+            sjgl_zsj_zsbtz
+        where SBBM = #{objectId}
+        limit 1
+    </select>
+
+    <select id="getJobDetailInfoByObjectId" resultType="java.util.Map">
+
+    </select>
 </mapper>