解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/SjglZsjZsbtzController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.SjglZsjZsbtzDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.SjglZsjZsbtzServiceImpl;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import org.springframework.web.bind.annotation.*;
+
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
+
+/**
+ * 设备基本信息 
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+@RestController
+@Api(tags = "设备基本信息 Api")
+@RequestMapping(value = "/sjgl-zsj-zsbtz")
+public class SjglZsjZsbtzController  {
+
+    @Autowired
+	SjglZsjZsbtzServiceImpl sjglZsjZsbtzServiceImpl;
+
+    /**
+     * 新增设备基本信息 
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/getSjglZsjZsbtzList")
+	@ApiOperation(httpMethod = "GET", value = "新增设备基本信息 ", notes = "新增设备基本信息 ")
+	public ResponseModel<List<SjglZsjZsbtz>> getSjglZsjZsbtzList(@RequestParam Long MACHGENRE,@RequestParam String WERKS) {
+
+	    return ResponseHelper.buildResponse(sjglZsjZsbtzServiceImpl.getSjglZsjZsbtzList(MACHGENRE,WERKS));
+	}
+
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TpriDmpDatabookController.java

+package com.yeejoin.amos.boot.module.jxiop.biz.controller;
+
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.TpriDmpDatabook;
+import com.yeejoin.amos.boot.module.jxiop.biz.service.impl.TpriDmpDatabookServiceImpl;
+import org.springframework.web.bind.annotation.RequestMapping;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.Api;
+import org.springframework.web.bind.annotation.RestController;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
+import java.util.List;
+
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+import org.springframework.beans.factory.annotation.Autowired;
+import javax.servlet.http.HttpServletRequest;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+
+/**
+ * 数据字典表
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+@RestController
+@Api(tags = "数据字典表Api")
+@RequestMapping(value = "/tpri-dmp-databook")
+public class TpriDmpDatabookController extends BaseController {
+
+    @Autowired
+	TpriDmpDatabookServiceImpl tpriDmpDatabookServiceImpl;
+
+    /**
+     * 新增数据字典表
+     *
+     * @return
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
+	@GetMapping(value = "/list")
+	@ApiOperation(httpMethod = "GET", value = "获取中间表数字字典列表", notes = "获取中间表数字字典列表")
+	public ResponseModel<List<TpriDmpDatabook>> getTpriDmpDatabookList() {
+	    return ResponseHelper.buildResponse(tpriDmpDatabookServiceImpl.getTpriDmpDatabookList());
+	}
+
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/SjglZsjZsbtzDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 设备基本信息 
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+@Data
+@ApiModel(value="SjglZsjZsbtzDto", description="设备基本信息 ")
+public class SjglZsjZsbtzDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId("DBID")
+    private Long dbid;
+
+    @ApiModelProperty(value = "设备类别0风机1设备2线缆3升压站4其他5箱变")
+    @TableField("MACHGENRE")
+    private Long machgenre;
+
+    @ApiModelProperty(value = "设备编码")
+    @TableField("SBBM")
+    private String sbbm;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("SBMC")
+    private String sbmc;
+
+    @ApiModelProperty(value = "机组品牌")
+    @TableField("MACHTYPE")
+    private Long machtype;
+
+    @ApiModelProperty(value = "经度")
+    @TableField("LONGITUDE")
+    private String longitude;
+
+    @ApiModelProperty(value = "纬度")
+    @TableField("LATITUDE")
+    private String latitude;
+
+    @ApiModelProperty(value = "容量")
+    @TableField("CAPACITYL")
+    private String capacityl;
+
+    @ApiModelProperty(value = "KKS编码")
+    @TableField("KKSBM")
+    private String kksbm;
+
+    @ApiModelProperty(value = "KKS描述")
+    @TableField("KKSMS")
+    private String kksms;
+
+    @ApiModelProperty(value = "型号")
+    @TableField("GGXH")
+    private String ggxh;
+
+    @ApiModelProperty(value = "生产厂家")
+    @TableField("SCCJ")
+    private String sccj;
+
+    @ApiModelProperty(value = "投产时间")
+    @TableField("TYRQ")
+    private Date tyrq;
+
+    @ApiModelProperty(value = "父设备")
+    @TableField("FSB")
+    private Long fsb;
+
+    @ApiModelProperty(value = "设备分类")
+    @TableField("SBFL")
+    private String sbfl;
+
+    @ApiModelProperty(value = "根节点ID")
+    @TableField("XTDY")
+    private Long xtdy;
+
+    @ApiModelProperty(value = "工厂编码")
+    @TableField("WERKS")
+    private String werks;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("CREATE_BY")
+    private Long createBy;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("CREATE_TIME")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新人")
+    @TableField("UPDATE_BY")
+    private Long updateBy;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("UPDATE_TIME")
+    private Date updateTime;
+
+    @ApiModelProperty(value = "时间戳")
+    @TableField("UPDATE_STAMP")
+    private LocalDateTime updateStamp;
+
+    @ApiModelProperty(value = "设备层级码（废弃）")
+    @TableField("SBCJM")
+    private String sbcjm;
+
+    @ApiModelProperty(value = "是否删除 未删除为0删除为1")
+    @TableField("IS_DEL")
+    private String isDel;
+
+    @ApiModelProperty(value = "所属系统")
+    @TableField("SSXT")
+    private Long ssxt;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/TpriDmpDatabookDto.java

+package com.yeejoin.amos.boot.module.jxiop.biz.dto;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 数据字典表
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+@Data
+@ApiModel(value="TpriDmpDatabookDto", description="数据字典表")
+public class TpriDmpDatabookDto {
+
+   private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "主键ID")
+    @TableId("DATA")
+    private Long dataid;
+
+    @ApiModelProperty(value = "编码")
+    @TableField("DATACODE")
+    private String datacode;
+
+    @ApiModelProperty(value = "名称")
+    @TableField("DATANAME")
+    private String dataname;
+
+    @ApiModelProperty(value = "说明")
+    @TableField("DATADESC")
+    private String datadesc;
+
+    @ApiModelProperty(value = "类型，1:数据项，0:分类")
+    @TableField("TYPE")
+    private String type;
+
+    @ApiModelProperty(value = "父ID")
+    @TableField("GROUPID")
+    private Long groupid;
+
+    @ApiModelProperty(value = "分类编码")
+    @TableField("GROUPCODE")
+    private String groupcode;
+
+    @TableField("PROJECTID")
+    private Long projectid;
+
+    @TableField("SYS_USER")
+    private String sysUser;
+
+    @ApiModelProperty(value = "排序字段")
+    @TableField("ORDERS")
+    private Integer orders;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/SjglZsjZsbtz.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.joda.time.DateTime;
+
+import java.time.LocalDateTime;
+import java.util.Date;
+
+/**
+ * 设备基本信息 
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+@Data
+@Accessors(chain = true)
+@TableName("sjgl_zsj_zsbtz")
+public class SjglZsjZsbtz  {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	@TableField("DBID")
+    private Long dbid;
+
+    /**
+     * 设备类别0风机1设备2线缆3升压站4其他5箱变
+     */
+	@TableField("MACHGENRE")
+    private Long machgenre;
+
+    /**
+     * 设备编码
+     */
+	@TableField("SBBM")
+    private String sbbm;
+
+    /**
+     * 设备名称
+     */
+	@TableField("SBMC")
+    private String sbmc;
+
+    /**
+     * 机组品牌
+     */
+	@TableField("MACHTYPE")
+    private Long machtype;
+
+    /**
+     * 经度
+     */
+	@TableField("LONGITUDE")
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+	@TableField("LATITUDE")
+    private String latitude;
+
+    /**
+     * 容量
+     */
+	@TableField("CAPACITYL")
+    private String capacityl;
+
+    /**
+     * KKS编码
+     */
+	@TableField("KKSBM")
+    private String kksbm;
+
+    /**
+     * KKS描述
+     */
+	@TableField("KKSMS")
+    private String kksms;
+
+    /**
+     * 型号
+     */
+	@TableField("GGXH")
+    private String ggxh;
+
+    /**
+     * 生产厂家
+     */
+	@TableField("SCCJ")
+    private String sccj;
+
+    /**
+     * 投产时间
+     */
+	@TableField("TYRQ")
+    private Date tyrq;
+
+    /**
+     * 父设备
+     */
+	@TableField("FSB")
+    private Long fsb;
+
+    /**
+     * 设备分类
+     */
+	@TableField("SBFL")
+    private String sbfl;
+
+    /**
+     * 根节点ID
+     */
+	@TableField("XTDY")
+    private Long xtdy;
+
+    /**
+     * 工厂编码
+     */
+	@TableField("WERKS")
+    private String werks;
+
+    /**
+     * 创建人
+     */
+	@TableField("CREATE_BY")
+    private Long createBy;
+
+    /**
+     * 创建时间
+     */
+	@TableField("CREATE_TIME")
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+	@TableField("UPDATE_BY")
+    private Long updateBy;
+
+    /**
+     * 更新时间
+     */
+	@TableField("UPDATE_TIME")
+    private Date updateTime;
+
+    /**
+     * 时间戳
+     */
+	@TableField("UPDATE_STAMP")
+    private DateTime updateStamp;
+
+    /**
+     * 设备层级码（废弃）
+     */
+	@TableField("SBCJM")
+    private String sbcjm;
+
+    /**
+     * 是否删除 未删除为0删除为1
+     */
+	@TableField("IS_DEL")
+    private String isDel;
+
+    /**
+     * 所属系统
+     */
+	@TableField("SSXT")
+    private Long ssxt;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/TpriDmpDatabook.java

+package com.yeejoin.amos.boot.module.jxiop.biz.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * 数据字典表
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+@Data
+@Accessors(chain = true)
+@TableName("tpri_dmp_databook")
+public class TpriDmpDatabook  {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+	@TableField("DATAID")
+    private Long dataid;
+
+    /**
+     * 编码
+     */
+	@TableField("DATACODE")
+    private String datacode;
+
+    /**
+     * 名称
+     */
+	@TableField("DATANAME")
+    private String dataname;
+
+    /**
+     * 说明
+     */
+	@TableField("DATADESC")
+    private String datadesc;
+
+    /**
+     * 类型，1:数据项，0:分类
+     */
+	@TableField("TYPE")
+    private String type;
+
+    /**
+     * 父ID
+     */
+	@TableField("GROUPID")
+    private Long groupid;
+
+    /**
+     * 分类编码
+     */
+	@TableField("GROUPCODE")
+    private String groupcode;
+
+    /**
+     * 
+     */
+	@TableField("PROJECTID")
+    private Long projectid;
+
+    /**
+     * 
+     */
+	@TableField("SYS_USER")
+    private String sysUser;
+
+    /**
+     * 排序字段
+     */
+	@TableField("ORDERS")
+    private Integer orders;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/SjglZsjZsbtzMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz;
+
+/**
+ * 设备基本信息  Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+public interface SjglZsjZsbtzMapper extends BaseMapper<SjglZsjZsbtz> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/TpriDmpDatabookMapper.java

+package com.yeejoin.amos.boot.module.jxiop.biz.mapper2;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.TpriDmpDatabook;
+
+/**
+ * 数据字典表 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+public interface TpriDmpDatabookMapper  extends  BaseMapper<TpriDmpDatabook>{
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/SjglZsjZsbtzServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.dto.SjglZsjZsbtzDto;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.SjglZsjZsbtz;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 设备基本信息 服务实现类
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+@Service
+public class SjglZsjZsbtzServiceImpl   {
+    /**
+     * 分页查询
+     */
+
+    @Autowired
+    SjglZsjZsbtzMapper sjglZsjZsbtzMapper;
+
+    public List<SjglZsjZsbtz> getSjglZsjZsbtzList(Long MACHGENRE,String WERKS){
+        List<SjglZsjZsbtz> sjglZsjZsbtzList =  new ArrayList<>();
+        sjglZsjZsbtzList = sjglZsjZsbtzMapper.selectList(new QueryWrapper<SjglZsjZsbtz>().eq("MACHGENRE",MACHGENRE).eq("WERKS",WERKS));
+        return sjglZsjZsbtzList;
+    }
+
+}
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/TpriDmpDatabookServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.jxiop.biz.entity.TpriDmpDatabook;
+import com.yeejoin.amos.boot.module.jxiop.biz.mapper2.TpriDmpDatabookMapper;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 数据字典表服务实现类
+ *
+ * @author system_generator
+ * @date 2023-07-03
+ */
+@Service
+public class TpriDmpDatabookServiceImpl {
+    @Autowired
+    TpriDmpDatabookMapper tpriDmpDatabookMapper;
+
+    public List<TpriDmpDatabook> getTpriDmpDatabookList() {
+        List<TpriDmpDatabook> tpriDmpDatabookList = new ArrayList<>();
+        tpriDmpDatabookList = this.tpriDmpDatabookMapper.selectList(new QueryWrapper<TpriDmpDatabook>().isNotNull("DATAID"));
+        return tpriDmpDatabookList;
+    }
+}
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper.cluster/SjglZsjZsbtzMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.SjglZsjZsbtzMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/resources/mapper.cluster/TpriDmpDatabookMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.biz.mapper2.TpriDmpDatabookMapper">
+
+</mapper>