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

huanghongfa

2021-10-08 690b6ec75d6f9198d1ca292e107109b80646faf8

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

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java

@@ -6,8 +6,7 @@

import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.community.ComMngPopulationDetailVO;
import com.panzhihua.common.model.vos.community.VillageVO;
import com.panzhihua.common.model.vos.community.*;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -25,8 +24,6 @@
import com.panzhihua.common.model.dtos.grid.admin.PageComMngVillagePopulationDTO;
import com.panzhihua.common.model.dtos.user.PageInputUserDTO;
import com.panzhihua.common.model.vos.area.AreaAddressVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationTotalVO;
import com.panzhihua.common.model.vos.community.ComMngPopulationVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilPopulationStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.civil.CivilVillageStatisticsVO;
import com.panzhihua.common.model.vos.community.screen.event.*;
@@ -703,7 +700,7 @@
     * @param commonPage
     * @return
     */
    IPage<ComMngPopulationVO> query(Page page,@Param("commonPage") CommonPage commonPage);
    IPage<ComMngPopulationNoSecretVO> query(Page page, @Param("commonPage") CommonPage commonPage);

    /**
     * 居民详情

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActFourMemberServiceImpl.java

@@ -197,7 +197,7 @@

    @Override
    public R selectByMember(CommonPage commonPage) {
        IPage<ComMngPopulationVO> comMngPopulationDOIPage=this.comMngPopulationDAO.query(new Page<ComMngPopulationDO>(commonPage.getPage(),commonPage.getSize()),commonPage);
        IPage<ComMngPopulationNoSecretVO> comMngPopulationDOIPage=this.comMngPopulationDAO.query(new Page<ComMngPopulationDO>(commonPage.getPage(),commonPage.getSize()),commonPage);
        if (!comMngPopulationDOIPage.getRecords().isEmpty()) {
            comMngPopulationDOIPage.getRecords().forEach(populDO -> {
                if (StringUtils.isNotEmpty(populDO.getBirthday())) {

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComElderAuthRecordsMapper.xml

@@ -324,6 +324,7 @@
    <select id="queryRecordWithPage" resultType="com.panzhihua.common.model.vos.community.IdentityAuthRecordDetailVO">
        SELECT
            cear.id,
            cear.auth_period,
            cear.auth_date,
            cear.auth_status,
            cear.reject_reason,

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngBuildingMapper.xml

@@ -32,7 +32,7 @@
    </resultMap>

    <select id="find" resultType="String">
        select distinct concat(alley,house_num,'号',IFNULL(floor,0),'栋') from com_mng_population_house   where id in (${id})
        select distinct concat(alley,house_num,'号',IFNULL(unit_no,0),'栋') from com_mng_population_house   where id in (${id})
    </select>

    <select id="findByVillage" resultType="String">

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComMngPopulationDOMapper.xml

@@ -373,7 +373,7 @@
            cmp.create_at DESC
    </select>

    <select id="query" resultType="com.panzhihua.common.model.vos.community.ComMngPopulationVO">
    <select id="query" resultType="com.panzhihua.common.model.vos.community.ComMngPopulationNoSecretVO">
        select * from com_mng_population
        <where>
            1=1

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java

@@ -12,6 +12,7 @@
import org.springframework.stereotype.Component;

import com.alibaba.fastjson.JSONObject;
import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_property.dao.ComPropertyAlarmDao;
import com.panzhihua.service_property.dto.DeviceDto;
import com.panzhihua.service_property.entity.ComPropertyAlarm;
@@ -73,7 +74,9 @@
    void dealData(String message) {
        comPropertyAlarmDao = SpringUtil.getBean(ComPropertyAlarmDao.class);
        DeviceDto deviceInfo = JSONObject.parseObject(message, DeviceDto.class);
        if (deviceInfo.getCallstatus().equals("RINGING")) {
        boolean checkFlag =
            "RINGING".equals(deviceInfo.getCallstatus()) && StringUtils.isNotEmpty(deviceInfo.getOri_number());
        if ("abort".equals(deviceInfo.getStatus()) || checkFlag) {
            logger.info("收到设备报警信息：{}", message);
            ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
            comPropertyAlarm.setSerialNo(deviceInfo.getUserid());

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dto/DeviceDto.java

@@ -25,6 +25,8 @@
    /** 状态 */
    private String status;
    /** 呼叫人员ID */
    private String ori_number;
    /** 呼叫人员ID */
    private String userid;
    /** 呼叫iD */
    private String callid;

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/message/AlarmMessage.java

@@ -32,7 +32,7 @@
            comPropertyAlarm.setCreateTime(DateUtil.date());
            comPropertyAlarm.setPhone(comPropertyEquipment.getPhone());
            comPropertyAlarm.setSerialNo(comPropertyEquipment.getSerialNo());
            comPropertyAlarm.setType(ComPropertyAlarm.type.one);
            comPropertyAlarm.setType(ComPropertyAlarm.type.time);
            comPropertyAlarm.setCommunityId(comPropertyEquipment.getCommunityId());
            comPropertyAlarm.setName(comPropertyEquipment.getUsername());
            comPropertyAlarm.setStatus(ComPropertyAlarm.status.dcl);

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/resources/mapper/ComPropertyAlarmMapper.xml

@@ -18,7 +18,7 @@
    </resultMap>

    <select id="selectList" resultType="com.panzhihua.common.model.vos.property.ComPropertyAlarmVO">
        select t.*,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName from com_property_alarm t
        select t.id,t.serial_no,t.type,t.create_time,t.phone,t1.name,t.status,t.solve_id,t.solve_time,t.solve_content,t.community_id,t.solve_url,t3.address as position,t1.longitude,t1.latitude,t2.name as solveName from com_property_alarm t
        left join com_property_equipment t1 on t.serial_no = t1.serial_no
        left join com_mng_population_house t3 on t1.village_id=t3.id
        left join sys_user t2 on t.solve_id = user_id
@@ -37,7 +37,7 @@
                and t3.address like concat(#{commonPage.address},'%')
            </if>
            <if test="commonPage.username !=null and commonPage.username !=''">
                and t.name like concat(#{commonPage.username},'%')
                and t1.name like concat(#{commonPage.username},'%')
            </if>
            <if test="commonPage.beginTime !=null">
                and t.create_time >=#{commonPage.beginTime}