1、webSocket相关代码进行了注解优化； 2、通信中间件把阀控器上报的阀门状态进行消息推送，前端、小程序可能用到（webSocket推送）。

liurunyu

2025-04-03 44a78bc47ab66d6492bc0579f58f24dc1921b5d5

 pipIrr-platform/pipIrr-web/pipIrr-web-project/src/main/java/com/dy/pipIrrProject/intake/IntakeSv.java

@@ -12,6 +12,7 @@
import com.dy.pipIrrGlobal.daoPr.PrDivideMapper;
import com.dy.pipIrrGlobal.daoPr.PrIntakeMapper;
import com.dy.pipIrrGlobal.pojoPr.PrIntake;
import com.dy.pipIrrGlobal.voPr.IntakeUpdateLngLat;
import com.dy.pipIrrGlobal.voPr.VoAllIntake;
import com.dy.pipIrrGlobal.voPr.VoIntake;
import com.dy.pipIrrGlobal.voPr.VoOnLineIntake;
@@ -118,14 +119,14 @@
     */

    public int update(PrIntake po) {
        if (po.getTownId() == null || po.getTownId() == 0) {
            Long townId = getSupperByVillageId(po.getVillageId());
            po.setTownId(townId);
        }
        if (po.getCountyId() == null || po.getCountyId() == 0) {
            Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
            po.setCountyId(countyId);
        }
//        if (po.getTownId() == null || po.getTownId() == 0) {
//            Long townId = getSupperByVillageId(po.getVillageId());
//            po.setTownId(townId);
//        }
//        if (po.getCountyId() == null || po.getCountyId() == 0) {
//            Long countyId = getSupperByVillageId(getSupperByVillageId(po.getVillageId()));
//            po.setCountyId(countyId);
//        }
        return this.prIntakeMapper.updateByPrimaryKeySelective(po);
//        return this.prIntakeMapper.updateByPrimaryKey(po);
    }
@@ -166,7 +167,6 @@
     * @return 所有取水口集合
     */
    public QueryResultVo<List<VoAllIntake>> selectAll() {
        
        QueryResultVo<List<VoAllIntake>> rsVo = new QueryResultVo<>();
        rsVo.obj = this.prIntakeMapper.selectAll();
        return rsVo;
@@ -178,7 +178,7 @@
     * @param id 取水口ID
     * @return 取水口实体
     */
    public PrIntake selectById(Long id) {
    public VoAllIntake selectById(Long id) {
        return this.prIntakeMapper.selectByPrimaryKey(id);
    }

@@ -343,4 +343,12 @@
    }


    /**
     * app修改取水口经纬度
     * @param po
     * @return
     */
    public int updateIntakeLngLat(IntakeUpdateLngLat po) {
        return prIntakeMapper.updateByPrimaryKeySelective1(po);
    }
}