Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseUserMsgService.java

@@ -6,6 +6,7 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.score.BaseEvaluateDO;
import com.yihu.jw.entity.base.score.BaseEvaluateScoreDO;
import com.yihu.jw.entity.base.words.BaseSensitiveDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
@@ -16,6 +17,7 @@ import com.yihu.jw.hospital.message.dao.BaseBannerDao;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.hospital.message.dao.BaseUserMessageDao;
import com.yihu.jw.hospital.message.dao.BaseUserMsgContentDao;
import com.yihu.jw.hospital.prescription.dao.BaseSensitiveDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
@@ -63,6 +65,8 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
    private BaseBannerDoctorDao baseBannerDoctorDao;
    @Autowired
    private BaseBannerDao bannerDao;
    @Autowired
    private BaseSensitiveDao baseSensitiveDao;
    @Value("${wechat.id}")
    private String wxId;
@@ -215,7 +219,17 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
            baseUserMsgDO.setReceiver(map.get("receiver").toString());
            baseUserMsgDO.setReceiverName(map.get("receiver_name").toString());
            baseUserMsgDO.setSender(map.get("sender").toString());
            baseUserMsgDO.setContent(map.get("content")==null?"":map.get("content").toString());
            List<BaseSensitiveDO> baseSensitiveDOS = baseSensitiveDao.getSensitiveWords();
            String content = map.get("content")==null?"":map.get("content").toString();
            for (BaseSensitiveDO sensitiveDO:baseSensitiveDOS){
                if (StringUtils.isNotBlank(content)){
                    if (content.contains(sensitiveDO.getSensitiveWord())){
                        content = content.replace(sensitiveDO.getSensitiveWord(),"****");
                    }
                }
            }
            baseUserMsgDO.setContent(content);
            baseUserMsgDO.setRelationCode(map.get("relation_code").toString());
            baseUserMsgDO.setRelationType(Integer.valueOf(map.get("relation_type").toString()));
            baseUserMsgDO.setRelationName(map.get("relation_name").toString());
@@ -242,6 +256,16 @@ public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUs
                        dealList.setSenderName(patientID==dealList.getSender()?dealList.getSenderName().substring(0,1)+"**":dealList.getSenderName());
                        dealList.setReceiverName(patientID==dealList.getReceiver()?dealList.getReceiverName().substring(0,1)+"**":dealList.getReceiverName());
                    }
                    String respongseContent = dealList.getContent();
                    for (BaseSensitiveDO sensitiveDO:baseSensitiveDOS){
                        if (StringUtils.isNotBlank(content)){
                            if (respongseContent.contains(sensitiveDO.getSensitiveWord())){
                                respongseContent = respongseContent.replace(sensitiveDO.getSensitiveWord(),"****");
                                dealList.setContent(respongseContent);
                            }
                        }
                    }
                }
            }

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/dao/BaseSensitiveDao.java

@@ -1,9 +1,13 @@
package com.yihu.jw.hospital.prescription.dao;
import com.yihu.jw.entity.base.words.BaseSensitiveDO;
import org.checkerframework.framework.qual.RequiresQualifier;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * @author HZY
 * @vsrsion 1.0
@@ -12,4 +16,6 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface BaseSensitiveDao extends PagingAndSortingRepository<BaseSensitiveDO, String>, JpaSpecificationExecutor<BaseSensitiveDO> {
    BaseSensitiveDO findBySensitiveWord(String sensitive);
    @Query(value = "select * from base_sensitive p where p.status = 1 ",nativeQuery = true)
    List<BaseSensitiveDO> getSensitiveWords();
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1026,6 +1026,7 @@ public class BaseHospitalRequestMapping {
        public static final String updateEquipment  = "/updateEquipment";
        public static final String deleteEquipment  = "/deleteEquipment";
        public static final String getEquipment  = "/getEquipment";
        public static final String getEquipmentAndCount  = "/getEquipmentAndCount";
    }
    

svr/svr-base/src/main/resources/application.yml

@@ -164,6 +164,8 @@ wlyy:
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040
  flag: false
pay:
  flag: false
#文件服务器上传配置 0本地，1.I健康,2.内网调用
testPattern:
  sign: 0

svr/svr-iot/src/main/java/com/yihu/iot/controller/equipment/IotEquipmentController.java

@@ -61,4 +61,12 @@ public class IotEquipmentController extends EnvelopRestEndpoint {
        iotEqtDetailService.updateEquipment(jsonData);
        return success("更新成功");
    }
    @GetMapping(value = BaseHospitalRequestMapping.IotEquipmentManage.getEquipmentAndCount)
    @ApiOperation(value = "更新/新增设备")
    public Envelop getCountAndEquipment(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception{
        JSONObject jsonObject =iotEqtDetailService.showJKXW();
        return success(jsonObject);
    }
}

svr/svr-iot/src/main/java/com/yihu/iot/dao/equipment/IotEquipmentDetailDao.java

@@ -1,11 +1,21 @@
package com.yihu.iot.dao.equipment;
import com.alibaba.druid.sql.dialect.mysql.ast.MysqlForeignKey;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
public interface IotEquipmentDetailDao extends PagingAndSortingRepository<IotEquipmentDetailDO, String>, JpaSpecificationExecutor<IotEquipmentDetailDO> {
import java.util.List;
import java.util.Map;
public interface IotEquipmentDetailDao extends PagingAndSortingRepository<IotEquipmentDetailDO, String>, JpaSpecificationExecutor<IotEquipmentDetailDO> {
    @Query(value = "select * from iot_equipment_detail t",nativeQuery = true)
    List<IotEquipmentDetailDO> getAllEquipment();
    @Query(value = "select count(1) AS \"total\",t.belong_are AS \"belong_are\" from iot_equipment_detail t group by t.belong_are_code",nativeQuery = true)
    List<Map<String, Object>> getAllEquipmentCountByAre();
    @Query(value = "select count(1) AS \"total\" from iot_equipment_detail t ",nativeQuery = true)
    List<Map<String, Object>> getAllEquipmentTotalCount();
}

svr/svr-iot/src/main/java/com/yihu/iot/service/equipment/IotEqtDetailService.java

@@ -1,5 +1,6 @@
package com.yihu.iot.service.equipment;
import com.alibaba.fastjson.JSONObject;
import com.yihu.iot.dao.equipment.IotEquipmentDetailDao;
import com.yihu.iot.util.excel.EntityUtils;
import com.yihu.jw.entity.iot.equipment.IotEquipmentDetailDO;
@@ -9,6 +10,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.UUID;
@Service
@@ -51,5 +54,21 @@ public class IotEqtDetailService  extends BaseJpaService<IotEquipmentDetailDO, I
        }
    }
    public JSONObject showJKXW(){
        JSONObject result = new JSONObject();
        List<IotEquipmentDetailDO> equipmentList= iotEquipmentDetailDao.getAllEquipment();
        if (equipmentList.size()>=0){
            result.put("equipmentList",equipmentList);
        }
        List<Map<String, Object>> areCount = iotEquipmentDetailDao.getAllEquipmentCountByAre();
        if (areCount.size()>=0){
            result.put("areEquipmentCount",areCount);
        }
        List<Map<String, Object>> countTotal=  iotEquipmentDetailDao.getAllEquipmentTotalCount();
        if (countTotal.size()>=0){
            result.put("equipmentTotalCount",countTotal);
        }
        return result;
    }
}