料控管理

shiwan/admin/src/main/java/com/huimv/admin/controller/primary/MachineControlController.java

@@ -1,7 +1,7 @@
-package com.huimv.admin.controller.primary;
+package com.huimv.admin.controller.secondary;
 
 import com.huimv.admin.dto.MachineControlDTO;
-import com.huimv.admin.service.primary.MachineControlService;
+import com.huimv.admin.service.secondary.MachineControlService;
 import com.huimv.admin.utils.Result;
 import com.huimv.admin.utils.ResultCode;
 import org.springframework.beans.factory.annotation.Autowired;

shiwan/admin/src/main/java/com/huimv/admin/domain/primary/DaJqda.java

@@ -1,141 +0,0 @@
-package com.huimv.admin.domain.primary;
-
-import lombok.Data;
-
-import javax.persistence.*;
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * 档案_机器档案
- */
-@Data
-@Entity
-@Table(name = "da_jqda")
-public class DaJqda implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * ID
-     */
-    @Id
-    @Column(name = "ID", nullable = false)
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer ID;
-
-    /**
-     * 机器ID
-     */
-    @Column(name = "JQID")
-    private String JQID;
-
-    /**
-     * 猪舍ID
-     */
-    @Column(name = "ZSID")
-    private Integer ZSID;
-
-    /**
-     * 区划编码
-     */
-    @Column(name = "QHBM")
-    private String QHBM;
-
-    /**
-     * 目标版本
-     */
-    @Column(name = "MBBB")
-    private String MBBB;
-
-    /**
-     * ftp命令
-     */
-    @Column(name = "FTPCMD")
-    private String FTPCMD;
-
-    /**
-     * 修改人
-     */
-    @Column(name = "XGR")
-    private String XGR;
-
-    /**
-     * 修改时间
-     */
-    @Column(name = "XGSJ", nullable = false)
-    private Date XGSJ;
-
-    /**
-     * 作废标志
-     */
-    @Column(name = "ZFBZ")
-    private Integer ZFBZ;
-
-    /**
-     * 当前版本
-     */
-    @Column(name = "DQBB")
-    private String DQBB;
-
-    /**
-     * 环控当前版本
-     */
-    @Column(name = "HKDQBB")
-    private String HKDQBB;
-
-    /**
-     * 环控目标版本
-     */
-    @Column(name = "HKMBBB")
-    private String HKMBBB;
-
-    /**
-     * 环控CMD命令
-     */
-    @Column(name = "HKFTPCMD")
-    private String HKFTPCMD;
-
-    /**
-     * 料槽当前版本
-     */
-    @Column(name = "LCDQBB")
-    private String LCDQBB;
-
-    /**
-     * 料槽目标版本
-     */
-    @Column(name = "LCMBBB")
-    private String LCMBBB;
-
-    /**
-     * 料槽CMD命令
-     */
-    @Column(name = "LCFTPCMD")
-    private String LCFTPCMD;
-
-    /**
-     * 序列号
-     */
-    @Column(name = "XLH")
-    private String XLH;
-
-    /**
-     * 站点号
-     */
-    @Column(name = "ZDH")
-    private String ZDH;
-
-    @Column(name = "IMEI")
-    private String IMEI;
-
-    @Column(name = "IMSI")
-    private String IMSI;
-
-    @Column(name = "CCID")
-    private String CCID;
-
-    @Column(name = "ESIMNAME")
-    private String ESIMNAME;
-
-}

shiwan/admin/src/main/java/com/huimv/admin/domain/primary/MachineControlEntity.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.domain.primary;
+package com.huimv.admin.domain.secondary;
 
 import javax.persistence.*;
 import java.io.Serializable;

shiwan/admin/src/main/java/com/huimv/admin/repo/primary/MachineControlRepository.java

@@ -1,13 +1,12 @@
-package com.huimv.admin.repo.primary;
+package com.huimv.admin.repo.secondary;
 
-import com.huimv.admin.domain.primary.MachineControlEntity;
+import com.huimv.admin.domain.secondary.MachineControlEntity;
 import com.huimv.admin.vo.MachineControlVO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Author yinhao

shiwan/admin/src/main/java/com/huimv/admin/service/primary/MachineControlService.java

@@ -1,4 +1,4 @@
-package com.huimv.admin.service.primary;
+package com.huimv.admin.service.secondary;
 
 import com.huimv.admin.dto.MachineControlDTO;
 import com.huimv.admin.utils.Result;

shiwan/admin/src/main/java/com/huimv/admin/service/primary/impl/MachineControlServiceImpl.java

@@ -1,13 +1,9 @@
-package com.huimv.admin.service.primary.impl;
+package com.huimv.admin.service.secondary.impl;
 
-import com.huimv.admin.domain.primary.DaJqda;
-import com.huimv.admin.domain.primary.MachineControlEntity;
+import com.huimv.admin.domain.secondary.MachineControlEntity;
 import com.huimv.admin.dto.MachineControlDTO;
-import com.huimv.admin.repo.primary.DaJqdaRepository;
-import com.huimv.admin.repo.primary.MachineControlRepository;
-import com.huimv.admin.service.primary.MachineControlService;
-import com.huimv.admin.utils.Result;
-import com.huimv.admin.utils.ResultCode;
+import com.huimv.admin.repo.secondary.MachineControlRepository;
+import com.huimv.admin.service.secondary.MachineControlService;
 import com.huimv.admin.vo.MachineControlVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;