Merge branch 'master' of http://111.30.93.211:10101/r/supipe

叶松

2023-12-04 6a9dc2c9553ae13bb3196f325c9905abbd502145

Merge branch 'master' of http://111.30.93.211:10101/r/supipe

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/controller/TMaterialReleaseController.java

@@ -115,7 +115,21 @@
        return materialReleaseService.mixingConsumeList(values);
    }


    //  ！！！列表 ：拌合站 （2023-11-16） 标识牌下拉
    @GetMapping("/mixingConsumePull")
    public BasicResult mixingConsumePull(){
        return materialReleaseService.mixingConsumePull();
    }
    //
    @GetMapping("/siloPull")
    public BasicResult siloPull(){
        return materialReleaseService.siloPull();
    }
    // web 端拌合站屏 列表
    @PostMapping("/siloMixingList")
    public BasicResult siloMixingList(@RequestBody Map<String,Object> values){
        return materialReleaseService.siloMixingList(values);
    }




 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/entity/TMixing.java

@@ -63,9 +63,11 @@
    private Integer stata;

    /**
     * 报告编号
     * id
     */
    private String siloId;
    //拌合站名称
    private String siloName;
    /**
     * 报告编号
     */
@@ -74,6 +76,8 @@
     * 检验时间
     */
    private String inspectDate;
    //1 展示 2不展示
    private Integer types;

    /**
     * This field was generated by MyBatis Generator.

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/mapper/TMaterialReleaseMappper.java

@@ -28,7 +28,7 @@

    List<TRawMaterial> materialRew(Integer byId);

    void mixingInsert(@Idkey("mixingId") HashMap<String, Object> values);
    void mixingInsert(@Idkey("mixingId") TMixing mixing);

    List<TMixing> mixingList(HashMap<String, Object> values);

@@ -47,4 +47,12 @@
    Integer starIntSig(String mixingSignboardId);

    List<TMixingConsume> mixingConsumes(@Param("mixingSignboardId") String mixingSignboardId,@Param("star") Integer star);

    List<TMixingSignboard> mixingConsumePull();

    List<TSilo> siloPull();

    void mixingUpdateType(String siloId);

    List<TMixing> siloMixingList(Map<String, Object> values);
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/TMaterialReleaseService.java

@@ -31,4 +31,10 @@
    BasicResult mixingConsumeIn(Map<String, Object> values);

    BasicResult mixingConsumeList(Map<String, Object> values);

    BasicResult mixingConsumePull();

    BasicResult siloPull();

    BasicResult siloMixingList(Map<String, Object> values);
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/concret/service/impl/TMaterialReleaseServiceImpl.java

@@ -222,8 +222,12 @@

    @Override
    public BasicResult mixingInsert(HashMap<String, Object> values) {
        values.put("mixingId","");
        materialReleaseMappper.mixingInsert(values);
        List<TMixing> mixingList = (List<TMixing>) values.get("mixingList");
        for (TMixing mixing : mixingList){
            materialReleaseMappper.mixingUpdateType(mixing.getSiloId());
            mixing.setTypes(1);
            materialReleaseMappper.mixingInsert(mixing);
        }
        return BasicResult.success();
    }

@@ -277,4 +281,22 @@
        PageInfo<TMixingSignboard> tMixingSignboardPageInfo = new PageInfo<>(mixingSignboards);
        return BasicResult.success(tMixingSignboardPageInfo);
    }

    @Override
    public BasicResult mixingConsumePull() {
        List<TMixingSignboard> mixingSignboards = materialReleaseMappper.mixingConsumePull();
        return BasicResult.success(mixingSignboards);
    }

    @Override
    public BasicResult siloPull() {
        List<TSilo> silos = materialReleaseMappper.siloPull();
        return BasicResult.success(silos);
    }

    @Override
    public BasicResult siloMixingList(Map<String, Object> values) {
        List<TMixing> tMixings =  materialReleaseMappper.siloMixingList(values);
        return BasicResult.success(tMixings);
    }
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/controller/WeighController.java

@@ -63,5 +63,9 @@
    public BasicResult materialWarehouseRecordDel(@RequestParam String id){
        return weighService.materialWarehouseRecordDel(id);
    }

    // 环境监测 thingjs 数据
    @PostMapping("/headThingJsDateValue")
    public BasicResult headThingJsDateValue(){
        return weighService.headThingJsDateValue();
    }
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/mapper/WeighMapper.java

@@ -5,6 +5,8 @@
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
import com.thhy.materials.modules.biz.concret.entity.dto.TMinxingPlant;
import com.thhy.materials.modules.biz.concret.entity.dto.WeighDto;
import com.thhy.materials.modules.biz.helmet.entity.TDataSmock;
import com.thhy.materials.modules.biz.helmet.entity.TDataValue;
import com.thhy.materials.modules.biz.video.entity.TVideoNo;
import com.thhy.materials.modules.biz.weigh.dto.QueryWeighDto;
import com.thhy.materials.modules.biz.weigh.entity.TSuMaterialWarehouseRecord;
@@ -109,4 +111,12 @@
    void materialWarehouseRecordUpdate(Map<String, Object> values);

    void materialWarehouseRecordDel(String id);

    List<TDataValue> headThingJsDateValue();

    TDataSmock headThingJsDateSmock();

    TDataValue headThingJsDateValueByOne();

    List<TDataValue> headThingJsDateValueMonth();
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/service/WeighService.java

@@ -52,4 +52,6 @@
    BasicResult materialWarehouseRecordUpdate(Map<String, Object> values);

    BasicResult materialWarehouseRecordDel(String id);

    BasicResult headThingJsDateValue();
}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/weigh/service/impl/WeighServiceImpl.java

@@ -7,6 +7,8 @@
import com.thhy.materials.modules.biz.concret.entity.dto.DicetName;
import com.thhy.materials.modules.biz.concret.entity.dto.TMinxingPlant;
import com.thhy.materials.modules.biz.concret.entity.dto.WeighDto;
import com.thhy.materials.modules.biz.helmet.entity.TDataSmock;
import com.thhy.materials.modules.biz.helmet.entity.TDataValue;
import com.thhy.materials.modules.biz.weigh.dto.QueryWeighDto;
import com.thhy.materials.modules.biz.weigh.entity.TSuMaterialWarehouseRecord;
import com.thhy.materials.modules.biz.weigh.entity.TWeighbridge;
@@ -156,4 +158,22 @@
        weighMapper.materialWarehouseRecordDel(id);
        return BasicResult.success();
    }

    @Override
    public BasicResult headThingJsDateValue() {
        //每小时数据值
        List<TDataValue> tDataValues = weighMapper.headThingJsDateValue();
        //烟尘  开关
        TDataSmock tDataSmock = weighMapper.headThingJsDateSmock();
        //环境最新一条
        TDataValue tDataValue = weighMapper.headThingJsDateValueByOne();
        //pm10 pm25 本月数据
        List<TDataValue> tDataValuesMonth = weighMapper.headThingJsDateValueMonth();
        HashMap<String, Object> map = new HashMap<>();
        map.put("tDataValues",tDataValues);
        map.put("tDataSmock",tDataSmock);
        map.put("tDataValue",tDataValue);
        map.put("tDataValuesMonth",tDataValuesMonth);
        return BasicResult.success(map);
    }
}

 hd/pipe/materialsManage/src/main/resources/mapping/TMaterialReleaseMapper.xml

@@ -163,7 +163,7 @@
     from  t_raw_material
    where  Piece=#{byId}
  </select>
  <insert id="mixingInsert" >
  <insert id="mixingInsert" parameterType="com.thhy.materials.modules.biz.concret.entity.TMixing">
    insert into t_mixing
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="mixingId != null">
@@ -205,6 +205,9 @@
      <if test="inspectDate != null">
        inspect_date,
      </if>
      <if test="types != null">
        types,
      </if>
    </trim>
    <trim prefix="values (" suffix=")" suffixOverrides=",">
      <if test="mixingId != null">
@@ -245,6 +248,9 @@
      </if>
      <if test="inspectDate != null">
        #{inspectDate,jdbcType=VARCHAR},
      </if>
      <if test="types != null">
        #{types},
      </if>
    </trim>
  </insert>
@@ -432,5 +438,50 @@
     left join  sys_dict sd on mc.dict_id=sd.dict_id
     where mc.mixing_signboard_id=#{mixingSignboardId} and mc.star=#{star}
  </select>
  <select id="mixingConsumePull" resultType="com.thhy.materials.modules.biz.concret.entity.TMixingSignboard">
    select
     mixing_signboard_id as mixingSignboardId,
     signboard_name as signboardName
     from t_mixing_signboard
  </select>
  <select id="siloPull" resultType="com.thhy.materials.modules.biz.concret.entity.TSilo">
    select silo_id as siloId,
silo_name as siloName,
types
    from t_silo
  </select>
  <update id="mixingUpdateType"  parameterType="java.lang.String">
    update t_mixing set types=2 where silo_id=#{siloId}
  </update>
  <select id="siloMixingList" resultType="com.thhy.materials.modules.biz.concret.entity.TMixing">
        SELECT
        tm.mixing_id as mixingId,
        tm.material as material,
        tm.spec as spec,
        tm.producer as producer,
        tm.stove as stove,
        tm.in_num as inNum,
        tm.in_date as inDate,
        tm.inspect_state as inspectState,
        tm.report_number as reportNumber,
        tm.stata as stata,
        tm.silo_id as siloId,
        tm.percentage as percentage,
        tm.inspect_date as inspectDate,
        ts.silo_name as siloName
FROM
    t_silo ts
    LEFT JOIN t_mixing tm ON ts.silo_id=tm.silo_id
    where  tm.types=1
    <if test="types!=null and types!='' ">
        and ts.types=#{types}
    </if>
    <if test="stata!=null and stata!='' ">
        and tm.stata=#{stata}
    </if>
    <if test="strTime!=null and strTime!=null and endTime!=null and endTime!='' ">
      and tm.in_date between #{strTime} and #{endTime}
    </if>
  </select>

</mapper>

 hd/pipe/materialsManage/src/main/resources/mapping/WeighMapper.xml

@@ -1023,4 +1023,91 @@
    <delete id="materialWarehouseRecordDel" parameterType="java.lang.String">
        delete from t_su_material_warehouse_record where id=#{id}
    </delete>
    <select id="headThingJsDateValue" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataValue">
        SELECT
    DATE_FORMAT( upload_time, "%Y-%m-%d %H:00:00" ) AS uploadTime,
    TRUNCATE(SUM(pm10)/count(pm10),0) as pm10,
    TRUNCATE(SUM(pm25)/count(pm25),0) as pm25,
    TRUNCATE(SUM(tsp)/count(tsp),0) as tsp,
    TRUNCATE(SUM(temperature)/count(temperature),1) as temperature,
    TRUNCATE(SUM(humidity)/count(humidity),1) as humidity,
    TRUNCATE(SUM(wind_speed)/count(wind_speed),1) as windSpeed
FROM
    t_data_value
WHERE
 year(upload_time)=year(NOW()) AND MONTH(upload_time)=MONTH(NOW()) and  DAY(upload_time)=DAY(NOW())
-- upload_time BETWEEN "2023-11-08 00:00:00" and "2023-11-08 23:59:59"
GROUP BY
    DATE_FORMAT( upload_time, "%Y-%m-%d %H:00:00" );
    </select>
    <select id="headThingJsDateSmock" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataSmock">
        select
    smoke_id as smokeId,
    `time` as `time`,
    I00 as i00,
    I01 as i01,
    I02 as i02,
    I03 as i03,
    I04 as i04,
    I05 as i05,
    I06 as i06,
    I07 as i07,
    I10 as i10,
    I11 as i11,
    Q00 as q00,
    Q01 as q01,
    Q02 as q02,
    Q03 as q03,
    Q04 as q04,
    Q05 as q05,
    VB0 as vb0,
    VB10 as vb10,
    VB11 as vb11,
    VB12 as vb12
     from  t_data_smock
     order by  `time` desc
    limit 0,1
    </select>
    <select id="headThingJsDateValueByOne" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataValue">
        select
 data_id as dataId,
 device_id as deviceId,
  device_name as deviceName,
   account_number as accountNumber,
    upload_time as uploadTime,
     pm25 as pm25,
      pm10 as pm10,
      tsp as tsp,
      temperature as temperature,
    humidity as humidity,
     data6 as data6,
      wind_speed as windSpeed,
      wind_direction as windDirection,
       tvoc as tvoc,
        no2 as no2,
        co as co,
         so2 as so2,
          o3 as o3,
          noise as noise
         from t_data_value
         order by  upload_time desc
         limit 0,1
    </select>
    <select id="headThingJsDateValueMonth" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataValue">
        SELECT
    DATE_FORMAT( upload_time, "%Y-%m-%d" ) AS uploadTime,
    TRUNCATE(SUM(pm10)/count(pm10),0) as pm10,
    TRUNCATE(SUM(pm25)/count(pm25),0) as pm25,
    TRUNCATE(SUM(tsp)/count(tsp),0) as tsp,
    TRUNCATE(SUM(temperature)/count(temperature),1) as temperature,
    TRUNCATE(SUM(humidity)/count(humidity),1) as humidity,
    TRUNCATE(SUM(wind_speed)/count(wind_speed),1) as windSpeed
FROM
    t_data_value
WHERE
  year(upload_time)=year(NOW()) AND MONTH(upload_time)=MONTH(NOW())
 -- upload_time BETWEEN "2023-11-01 00:00:00" and "2023-11-30 23:59:59"
GROUP BY
    DATE_FORMAT( upload_time, "%Y-%m-%d" );
    </select>
</mapper>

 hd/pipe/mobile/src/main/java/com/thhy/mobile/modules/biz/pipeinfo/mapper/PipeInfoMapper.java

@@ -63,7 +63,7 @@

    RingCompleteCheck queryRingComplete(PipeInfo pipeinfo);

    RingCompleteCheck queryRingCompleteByMod(String mouldNum,String proId);
    RingCompleteCheck queryRingCompleteByMod(@Param("mouldNum") String mouldNum,@Param("proId") String proId);

    int queryMaxRingNum(String companyId);


 web/src/views/MixingInfo/components/List.vue

@@ -47,7 +47,7 @@
}
</script>

<style scoped>
<style lang="scss" scoped>
.list {
  display: flex;
  flex-direction: column;

 web/src/views/MixingInfo/mixRatio.vue

@@ -103,7 +103,7 @@
        $html.style.fontSize = ''
    },
    methods: {
        async getLists() {
        getLists() {
            const params = {
                pageNum: --this.type, // 传 0 1对应两个页面
                pageSize: 1,
@@ -139,7 +139,7 @@
    }
}
</script>
<style scoped>
<style lang="scss" scoped>
.wrap {
    position: absolute;
    width: 100%;
@@ -239,7 +239,7 @@
    .row.line {
        display: flex;

        >div {
        > div {
            flex: 1;
        }
    }

 web/src/views/MixingInfo/mixing.vue

@@ -137,7 +137,7 @@
    }
}
</script>
<style scoped>
<style lang="scss" scoped>
li {
    list-style: none;
}
@@ -258,7 +258,7 @@
                min-height: 480px;
                text-align: center;

                >p {
                > p {
                    position: absolute;
                    left: 50%;
                    top: 21%;