feat():后端代码提交

jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml

@@ -14,20 +14,18 @@ spring:
     cache: false #spring内置thymeleaf缓存
 
     # ===================== 数据源配置 =====================
-    #  exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid
+  exclude: com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure #排除自动配置，手动配置druid
-    #  datasource:
+  datasource:
-    #    db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写)
+    db-type: MySQL #数据库类型(可选值 MySQL、SQLServer、Oracle、DM8、KingbaseES、PostgreSQL，请严格按可选值填写)
-    #    host: 222.71.165.188
+    host: 222.71.165.188
-    #    port: 3309
+    port: 3309
-    #    username: root
+    username: root
-    #    password: linus,.123
+    password: linus,.123
-    #    db-name: jnpf_yys_dev
+    db-name: jnpf_yys_dev
-    #    db-schema: #金仓达梦选填
+    db-schema: #金仓达梦选填
-    #    prepare-url: #自定义url
+    prepare-url: #自定义url
 
     # ===================== 动态多数据源 =====================
-  datasource:
-    db-type: MySQL
     dynamic:
       primary: master #设置默认的数据源或者数据源组,默认值即为master
       strict: true #严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
@@ -63,14 +61,14 @@ spring:
           statementParameterSetLogEnabled: false
       datasource:
         master:
-          url: jdbc:mysql://222.71.165.188:3309/jnpf_yys_dev?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/${spring.datasource.dbname}?useUnicode=true&characterEncoding=utf-8&useSSL=false&allowMultiQueries=true&serverTimezone=UTC
-          username: root
+          username: ${spring.datasource.username}
-          password: linus,.123
+          password: ${spring.datasource.password}
           driver-class-name: com.mysql.cj.jdbc.Driver
         slave_1:
-          url: jdbc:mysql://222.71.165.188:3309/yys-sc?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://${spring.datasource.host}:${spring.datasource.port}/yys-sc?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-          username: root
+          username: ${spring.datasource.username}
-          password: linus,.123
+          password: ${spring.datasource.password}
           driver-class-name: com.mysql.cj.jdbc.Driver
 
   # ===================== Redis配置 =====================

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/mapper/YysDeviceMaterialMapper.java

@@ -0,0 +1,7 @@
+package jnpf.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import jnpf.entity.YysDeviceMaterialEntity;
+
+public interface YysDeviceMaterialMapper extends BaseMapper<YysDeviceMaterialEntity> {
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceDataService.java

@@ -34,4 +34,5 @@ public interface YysDeviceDataService extends IService<YysDeviceDataEntity> {
 
     List<EqmtCollectPubDataEntity> syncData(List<Long> syncIds);
 
+    List<EqmtCollectPubDataEntity> zxcv();
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceMaterialService.java

@@ -0,0 +1,17 @@
+package jnpf.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import jnpf.entity.YysDeviceMaterialEntity;
+
+import java.util.List;
+
+public interface YysDeviceMaterialService extends IService<YysDeviceMaterialEntity> {
+    /**
+     * 设备绑定物料
+     *
+     * @param deviceCode
+     * @param data
+     * @return
+     */
+    String saveData(String deviceCode, List<YysDeviceMaterialEntity> data);
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/YysDeviceService.java

@@ -1,12 +1,11 @@
 package jnpf.service;
 
-import jnpf.model.yysdevice.*;
-import jnpf.entity.*;
-
-import java.util.*;
-
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import jnpf.entity.YysDeviceEntity;
+import jnpf.model.yysdevice.YysDeviceForm;
+import jnpf.model.yysdevice.YysDevicePagination;
+
+import java.util.List;
 
 /**
  * yysDevice
@@ -41,4 +40,12 @@ public interface YysDeviceService extends IService<YysDeviceEntity> {
      * @return name
      */
     String queryNameByCode(String code);
+
+    /**
+     * 设备绑定物料信息
+     *
+     * @param yysDeviceForm
+     * @return
+     */
+    String bandMaterial(YysDeviceForm yysDeviceForm);
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceDataServiceImpl.java

@@ -331,4 +331,19 @@ public class YysDeviceDataServiceImpl extends ServiceImpl<YysDeviceDataMapper, Y
         //过滤出已经生成的
         return result.stream().filter(obj -> !syncIds.contains(obj.getId())).collect(Collectors.toList());
     }
+
+    @Override
+    @DS("slave_1")
+    public List<EqmtCollectPubDataEntity> zxcv() {
+        List<EqmtCollectPubDataEntity> result = Lists.newArrayList();
+        String[] lines = new String[]{"1", "2", "3", "4"};
+        for (String line : lines) {
+            String childTable = "eqmt_collect_data_sc_" + line;
+            String sql = "select b.*," + line + " as line from " + childTable + " a left join eqmt_collect_pub_data b on a.eqmt_id = b.eqmt_id";
+            RowMapper<EqmtCollectPubDataEntity> rowMapper = new BeanPropertyRowMapper<>(EqmtCollectPubDataEntity.class);
+            result.addAll(this.jdbcTemplate.query(sql, rowMapper));
+        }
+        //过滤出已经生成的
+        return result;
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceMaterialServiceImpl.java

@@ -0,0 +1,48 @@
+package jnpf.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import jnpf.entity.YysDeviceMaterialEntity;
+import jnpf.mapper.YysDeviceMaterialMapper;
+import jnpf.service.YysDeviceMaterialService;
+import jnpf.util.DateUtil;
+import jnpf.util.GeneraterSwapUtil;
+import jnpf.util.RandomUtil;
+import jnpf.util.UserProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class YysDeviceMaterialServiceImpl extends ServiceImpl<YysDeviceMaterialMapper, YysDeviceMaterialEntity> implements YysDeviceMaterialService {
+    @Autowired
+    private GeneraterSwapUtil generaterSwapUtil;
+
+    @Autowired
+    private UserProvider userProvider;
+
+    @Override
+    public String saveData(String deviceCode, List<YysDeviceMaterialEntity> data) {
+        //先删除
+        LambdaQueryWrapper<YysDeviceMaterialEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(YysDeviceMaterialEntity::getDeviceCode, deviceCode);
+        this.remove(wrapper);
+
+        List<YysDeviceMaterialEntity> root = data.stream().map(entity -> {
+            String mainId = RandomUtil.uuId();
+            entity.setId(mainId);
+            entity.setDeviceCode(deviceCode);
+            entity.setCreatorTime(DateUtil.getNowDate());
+            entity.setCreatorUserId(userProvider.get().getUserId());
+            return entity;
+        }).collect(Collectors.toList());
+        boolean result = this.saveBatch(root);
+        if (result) {
+            return "绑定成功";
+        }
+        return "绑定失败";
+    }
+}

jnpf-java-boot/jnpf-example/jnpf-example-biz/src/main/java/jnpf/service/impl/YysDeviceServiceImpl.java

@@ -1,50 +1,37 @@
 package jnpf.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import jnpf.entity.*;
-import jnpf.mapper.YysDeviceMapper;
-import jnpf.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import jnpf.model.yysdevice.*;
-
-import java.math.BigDecimal;
-
 import cn.hutool.core.util.ObjectUtil;
-import jnpf.permission.model.authorize.AuthorizeConditionModel;
-import jnpf.util.GeneraterSwapUtil;
-import jnpf.database.model.superQuery.SuperQueryJsonModel;
-import jnpf.database.model.superQuery.ConditionJsonModel;
-import jnpf.database.model.superQuery.SuperQueryConditionModel;
-
-import java.lang.reflect.Field;
-
 import com.baomidou.mybatisplus.annotation.TableField;
-
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import java.util.regex.Pattern;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-
-import jnpf.model.QueryModel;
-
-import java.util.stream.Collectors;
-
-import jnpf.base.model.ColumnDataModel;
-import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import jnpf.database.model.superQuery.SuperJsonModel;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import java.text.SimpleDateFormat;
-
-import jnpf.util.*;
-
-import java.util.*;
-
 import jnpf.base.UserInfo;
+import jnpf.base.model.ColumnDataModel;
+import jnpf.database.model.superQuery.SuperJsonModel;
+import jnpf.entity.YysDeviceEntity;
+import jnpf.mapper.YysDeviceMapper;
+import jnpf.model.QueryModel;
+import jnpf.model.yysdevice.YysDeviceConstant;
+import jnpf.model.yysdevice.YysDeviceForm;
+import jnpf.model.yysdevice.YysDevicePagination;
 import jnpf.permission.entity.UserEntity;
+import jnpf.service.YysDeviceMaterialService;
+import jnpf.service.YysDeviceService;
+import jnpf.service.YysDeviceUpkeepService;
+import jnpf.util.*;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * yysDevice
@@ -64,6 +51,9 @@ public class YysDeviceServiceImpl extends ServiceImpl<YysDeviceMapper, YysDevice
     @Resource
     private YysDeviceUpkeepService yysDeviceUpkeepService;
 
+    @Resource
+    private YysDeviceMaterialService yysDeviceMaterialService;
+
     @Override
     public List<YysDeviceEntity> getList(YysDevicePagination yysDevicePagination) {
         return getTypeList(yysDevicePagination, yysDevicePagination.getDataType());
@@ -351,4 +341,12 @@ public class YysDeviceServiceImpl extends ServiceImpl<YysDeviceMapper, YysDevice
         }
         return "未知";
     }
+
+    @Override
+    public String bandMaterial(YysDeviceForm yysDeviceForm) {
+        if (StringUtils.isBlank(yysDeviceForm.getDeviceCode())) {
+            return "绑定失败，设备编码不能为空";
+        }
+        return yysDeviceMaterialService.saveData(yysDeviceForm.getDeviceCode(),yysDeviceForm.getData());
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceController.java

@@ -349,10 +349,19 @@ public class YysDeviceController {
         return ActionResult.success(yysDeviceMap);
     }
 
-
     @Operation(summary = "根据设备code查询设备名称")
     @GetMapping("/queryNameByCode/{code}")
     public ActionResult queryNameByCode(@PathVariable("code") String code) {
         return ActionResult.success(yysDeviceService.queryNameByCode(code));
     }
+
+    @PostMapping("/bandMaterial")
+    @Operation(summary = "绑定物料")
+    public ActionResult bandMaterial(@RequestBody YysDeviceForm yysDeviceForm) {
+        String result = yysDeviceService.bandMaterial(yysDeviceForm);
+        if (result.contains("成功")) {
+            return ActionResult.fail(result);
+        }
+        return ActionResult.fail(result);
+    }
 }

jnpf-java-boot/jnpf-example/jnpf-example-controller/src/main/java/jnpf/controller/YysDeviceDataController.java

@@ -187,4 +187,10 @@ public class YysDeviceDataController {
         return ActionResult.success(yysDeviceDataMap);
     }
 
+    @Operation(summary = "信息")
+    @GetMapping("/zxcv")
+    public ActionResult zxcv(){
+        return ActionResult.success(yysDeviceDataService.zxcv());
+    }
+
 }

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/entity/YysDeviceMaterialEntity.java

@@ -0,0 +1,46 @@
+package jnpf.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+@TableName("yys_device_material")
+public class YysDeviceMaterialEntity {
+    @TableId(value ="ID"  )
+    private String id;
+    @TableField(value = "DEVICE_CODE" , updateStrategy = FieldStrategy.IGNORED)
+    private String deviceCode;
+    @TableField(value = "MATERIAL_ID" , updateStrategy = FieldStrategy.IGNORED)
+    private String materialId;
+    @TableField(value = "MATERIAL_NAME" , updateStrategy = FieldStrategy.IGNORED)
+    private String materialName;
+    @TableField("F_CREATOR_TIME")
+    private Date creatorTime;
+    @TableField("F_CREATOR_USER_ID")
+    private String creatorUserId;
+    @TableField("F_LAST_MODIFY_TIME")
+    private Date lastModifyTime;
+    @TableField("F_LAST_MODIFY_USER_ID")
+    private String lastModifyUserId;
+    @TableField("F_DELETE_TIME")
+    private Date deleteTime;
+    @TableField("F_DELETE_USER_ID")
+    private String deleteUserId;
+    @TableField("F_DELETE_MARK")
+    private Integer deleteMark;
+    @TableField("F_TENANT_ID")
+    private String tenantId;
+    @TableField("COMPANY_ID")
+    private String companyId;
+    @TableField("DEPARTMENT_ID")
+    private String departmentId;
+    @TableField("ORGANIZE_JSON_ID")
+    private String organizeJsonId;
+    @TableField("F_FLOW_ID")
+    private String flowId;
+}

jnpf-java-boot/jnpf-example/jnpf-example-entity/src/main/java/jnpf/model/yysdevice/YysDeviceForm.java

@@ -1,5 +1,6 @@
 package jnpf.model.yysdevice;
 
+import jnpf.entity.YysDeviceMaterialEntity;
 import lombok.Data;
 import java.util.List;
 import java.math.BigDecimal;
@@ -38,4 +39,9 @@ public class YysDeviceForm  {
     /** 启用状态 **/
     @JsonProperty("enabledStatus")
     private Object enabledStatus;
+
+    /**
+     * 设备绑定得物料信息
+     */
+    private List<YysDeviceMaterialEntity> data;
 }