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

张晓波

2023-10-30 4bc74cce28fd8c01433bed66b4d36da0ba9b3f79

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

 hd/pipe/materialsManage/src/main/java/com/thhy/MaterialsApplication.java

@@ -2,6 +2,7 @@

import com.thhy.materials.modules.biz.helmet.smoke.SmokeServer;
import org.mybatis.spring.annotation.MapperScan;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -16,6 +17,9 @@
@EnableScheduling
public class MaterialsApplication implements CommandLineRunner {

    @Value("${materialstcpport}")
    private Integer tcpport;

    @Resource
    private SmokeServer smokeServer;

@@ -25,7 +29,7 @@

    @Override
    public void run(String... args) throws Exception {
        smokeServer.run(8973);
        smokeServer.run(tcpport);
    }

}

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/mapper/HelmetMapper.java

@@ -48,7 +48,7 @@

    List<THelmetReport> helmetReportUser(Map<String, Object> values);

    void smockInsert(TDataSmock tDataSmock);
    void smockIn(TDataSmock tDataSmock);

    List<TDataSmock> dataSmockList(Map<String, Object> values);


 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/HelmetService.java

@@ -42,7 +42,7 @@

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

    void smockInsert(TDataSmock tDataSmock);
    void smockIn(TDataSmock tDataSmock);

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


 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/service/impl/HelmetServiceImpl.java

@@ -135,9 +135,9 @@
    }

    @Override
    public void smockInsert(TDataSmock tDataSmock) {
    public void smockIn(TDataSmock tDataSmock) {
        System.out.println("参数为---"+tDataSmock.toString());
        helmetMapper.smockInsert(tDataSmock);
        helmetMapper.smockIn(tDataSmock);
    }

    @Override

 hd/pipe/materialsManage/src/main/java/com/thhy/materials/modules/biz/helmet/smoke/SmokeMessage.java

@@ -73,7 +73,7 @@
        tDataSmock.setPress(jsonObject11.get("Press").toString());
        tDataSmock.setDc(jsonObject11.get("Dc").toString());
        System.out.println("-------"+tDataSmock);
        getUserService().smockInsert(tDataSmock);
        getUserService().smockIn(tDataSmock);
    }
    @Override
    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {

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

@@ -553,7 +553,7 @@
        order by sm_time desc
  </select>

  <insert id="smockInsert" >
  <insert id="smockIn" >
    insert into t_data_smock
    <trim prefix="(" suffix=")" suffixOverrides=",">
      <if test="smokeId != null">