bug修改

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/pom.xml

@@ -27,7 +27,7 @@
         </dependency>
       <dependency>
           <groupId>com.amosframework.boot</groupId>
-          <artifactId>amos-boot-module-jxiop-biz</artifactId>
+          <artifactId>amos-boot-module-jxiop-api</artifactId>
           <version>1.0.0</version>
           <scope>compile</scope>
       </dependency>

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.biz.common.feign.AmosFeignService;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
+import com.yeejoin.amos.boot.module.jxiop.api.Enum.QrcodeColorEnum;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonBasicDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.RiskBizInfoVo;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.RiskDynamicDetailsVo;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonAccount;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
+import com.yeejoin.amos.boot.module.jxiop.api.feign.AgencyuserFeign;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonAccountFedMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
+import com.yeejoin.amos.boot.module.jxiop.api.util.Constants;
+import com.yeejoin.amos.feign.systemctl.model.DictionarieValueModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 人员基本信息服务实现类
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+@Service
+public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBasic, PersonBasicMapper> implements IPersonBasicService {
+
+    @Autowired
+    PersonBasicMapper personBasicMapper;
+
+
+    @Value("${amos.secret.key}")
+    String secretKey;
+
+
+    @Autowired
+    private AmosFeignService amosFeignService;
+
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @Autowired
+    protected EmqKeeper emqKeeper;
+
+
+    @Autowired
+    private AgencyuserFeign agencyuserFeign;
+
+    /**
+     * 人员赋码触发风险模型
+     */
+    public static final String RYFM_DATA_MQTT_TOPIC = "ryfm/data/analysis";
+
+
+    /**
+     * 人员红黄码恢复为绿码
+     */
+    public static final String RYFM_GREEN = "ryfm/person/green";
+
+
+
+    private String UPDATE="UPDATE";
+    private String INSERT="INSERT";
+    @Autowired
+    PersonAccountFedMapper personAccountFedMapper;
+
+
+    public RiskBizInfoVo fetchData(PersonBasic personBasic, PersonAccount personAccount) {
+        RiskBizInfoVo riskBizInfoVo = new RiskBizInfoVo();
+        riskBizInfoVo.setWarningObjectName(personAccount.getProjectName() + personBasic.getPostName() + personAccount.getName());
+        riskBizInfoVo.setWarningObjectCode(String.valueOf(personBasic.getSequenceNbr()));
+        riskBizInfoVo.setSourceAttribution(personBasic.getProjectOrgCode());
+        riskBizInfoVo.setSourceAttributionDesc(personAccount.getProjectName());
+        riskBizInfoVo.setWarningObjectType("RYFM");
+        List<RiskDynamicDetailsVo> detailsVos = new ArrayList<>();
+        RiskDynamicDetailsVo dynamicDetailsVo = new RiskDynamicDetailsVo();
+        dynamicDetailsVo.setTabName("预警详情");
+        detailsVos.add(dynamicDetailsVo);
+        riskBizInfoVo.setDynamicDetails(detailsVos);
+        return riskBizInfoVo;
+    }
+
+    public void addRedisPostAndCerInfo() {
+        List<DictionarieValueModel> elevatorCategory = null;
+        try {
+            elevatorCategory = amosFeignService.listDictionaryByDictCode("YGZYJNJDZS");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Map<String, String> collect = elevatorCategory.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
+        redisUtils.set(Constants.JXIOP_DICT_POST, collect);
+
+        List<DictionarieValueModel> elevator = null;
+        try {
+            elevator = amosFeignService.listDictionaryByDictCode("岗位资质鉴定证书");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        Map<String, String> collect2 = elevator.stream().collect(Collectors.toMap(DictionarieValueModel::getDictDataKey, DictionarieValueModel::getDictDataDesc));
+        redisUtils.set(Constants.JXIOP_DICT_CERTIFICATES, collect2);
+    }
+
+    public Page<Map<String, Object>> getPersonYardByPage(String parentCode,
+                                                         Integer current,
+                                                         Integer size,
+                                                         String date,
+                                                         String qrCodeColor) {
+        List<Map<String, Object>> resultList = personBasicMapper.getPersonYardByPage((current - 1) * size, size , parentCode, date, qrCodeColor);
+        Integer count = personBasicMapper.getPersonYardByPageCount(parentCode, date, qrCodeColor);
+
+        resultList.forEach(item -> {
+            String name = QrcodeColorEnum.getName(String.valueOf(item.get("qrCodeColor")));
+            item.put("name", name);
+        });
+        Page<Map<String, Object>> mapPage = new Page<>();
+        mapPage.setRecords(resultList);
+        mapPage.setCurrent(current);
+        mapPage.setSize(size);
+        mapPage.setTotal(count);
+        return mapPage;
+    }
+}
\ No newline at end of file

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

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.StationQrCodeStatistics;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationQrCodeStatisticsMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.service.StationQrCodeStatisticsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class StationQrCodeStatisticsServiceImpl extends ServiceImpl<StationQrCodeStatisticsMapper, StationQrCodeStatistics> implements StationQrCodeStatisticsService {
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/pom.xml

@@ -54,9 +54,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <classifier>exec</classifier>
-                </configuration>
             </plugin>
         </plugins>
     </build>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/pom.xml

@@ -53,9 +53,6 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <configuration>
-                    <classifier>exec</classifier>
-                </configuration>
             </plugin>
         </plugins>
     </build>