Merge remote-tracking branch 'origin/master'

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

@@ -0,0 +1,86 @@
+package com.huimv.admin.controller.primary;
+
+import com.huimv.admin.dto.MachineControlDTO;
+import com.huimv.admin.service.primary.MachineControlService;
+import com.huimv.admin.utils.Result;
+import com.huimv.admin.utils.ResultCode;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/1 17:40
+ * @Description 料控管理Controller
+ */
+@CrossOrigin
+@RestController("/machineControl")
+public class MachineControlController {
+
+    @Autowired
+    private MachineControlService machineControlService;
+
+    /**
+     * 保存料机信息
+     * @param machineControlDTO
+     * @return
+     */
+    @RequestMapping("/save")
+    public Result save(@RequestBody MachineControlDTO machineControlDTO) {
+        machineControlService.save(machineControlDTO);
+        return new Result(10000,"保存料机信息成功",true);
+    }
+
+    /**
+     * 分页条件查询料机信息
+     * @param pageNum
+     * @param pageSize
+     * @param keyword
+     * @return
+     */
+    @RequestMapping("/list")
+    public Result list(Integer pageNum,Integer pageSize,String keyword){
+        Map<String,Object> map = machineControlService.list(pageNum,pageSize,keyword);
+        return new Result(ResultCode.SUCCESS,map);
+    }
+
+    /**
+     * 根据id删除料机信息
+     * @param id
+     * @return
+     */
+    @RequestMapping("/deleteById")
+    public Result delete(@RequestParam(name = "id") Integer id){
+        machineControlService.deleteById(id);
+        return new Result(10000,"删除料机信息成功",true);
+    }
+
+    /**
+     * 新增时选择猪舍的下拉框
+     * @return
+     */
+    @RequestMapping("/selectBox")
+    public Result selectBox4add(){
+        List<String> zsList = machineControlService.selectBox4add();
+        return new Result(ResultCode.SUCCESS,zsList);
+    }
+
+
+
+//    @RequestMapping("/changeMachineStartTime")
+//    public Result changeMachineStartTime() {
+//        return null;
+//    }
+
+    //    /**
+//     * 根据机器id查询料机信息
+//     * @param zsId
+//     * @return
+//     */
+//    @RequestMapping("/listByZsId")
+//    public Result listByZsId(@RequestParam(name = "zsId") Integer zsId){
+//       return machineControlService.listByZsId(zsId);
+//    }
+}

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

@@ -0,0 +1,141 @@
+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

@@ -0,0 +1,240 @@
+package com.huimv.admin.domain.primary;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/1 18:01
+ * @Description 料控管理实体类
+ */
+
+@Entity
+@Table(name = "da_lkpz")
+public class MachineControlEntity implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Id
+    @Column(name = "id", nullable = false)
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+
+    @Column(name = "jqid")
+    private String jqId;
+
+    @Column(name = "no1_dlstart_time1")
+    private String no1DlstartTime1;
+
+    @Column(name = "no1_dlstart_time2")
+    private String no1DlstartTime2;
+
+    @Column(name = "no1_dlstart_time3")
+    private String no1DlstartTime3;
+
+    @Column(name = "no1_dlstart_time4")
+    private String no1DlstartTime4;
+
+    @Column(name = "no2_dlstart_time1")
+    private String no2DlstartTime1;
+
+    @Column(name = "no2_dlstart_time2")
+    private String no2DlstartTime2;
+
+    @Column(name = "no2_dlstart_time3")
+    private String no2DlstartTime3;
+
+    @Column(name = "no2_dlstart_time4")
+    private String no2DlstartTime4;
+
+    @Column(name = "no3_dlstart_time1")
+    private String no3DlstartTime1;
+
+    @Column(name = "no3_dlstart_time2")
+    private String no3DlstartTime2;
+
+    @Column(name = "no3_dlstart_time3")
+    private String no3DlstartTime3;
+
+    @Column(name = "no3_dlstart_time4")
+    private String no3DlstartTime4;
+
+    @Column(name = "no4_dlstart_time1")
+    private String no4DlstartTime1;
+
+    @Column(name = "no4_dlstart_time2")
+    private String no4DlstartTime2;
+
+    @Column(name = "no4_dlstart_time3")
+    private String no4DlstartTime3;
+
+    @Column(name = "no4_dlstart_time4")
+    private String no4DlstartTime4;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getJqId() {
+        return jqId;
+    }
+
+    public void setJqId(String jqId) {
+        this.jqId = jqId;
+    }
+
+    public String getNo1DlstartTime1() {
+        return no1DlstartTime1;
+    }
+
+    public void setNo1DlstartTime1(String no1DlstartTime1) {
+        this.no1DlstartTime1 = no1DlstartTime1;
+    }
+
+    public String getNo1DlstartTime2() {
+        return no1DlstartTime2;
+    }
+
+    public void setNo1DlstartTime2(String no1DlstartTime2) {
+        this.no1DlstartTime2 = no1DlstartTime2;
+    }
+
+    public String getNo1DlstartTime3() {
+        return no1DlstartTime3;
+    }
+
+    public void setNo1DlstartTime3(String no1DlstartTime3) {
+        this.no1DlstartTime3 = no1DlstartTime3;
+    }
+
+    public String getNo1DlstartTime4() {
+        return no1DlstartTime4;
+    }
+
+    public void setNo1DlstartTime4(String no1DlstartTime4) {
+        this.no1DlstartTime4 = no1DlstartTime4;
+    }
+
+    public String getNo2DlstartTime1() {
+        return no2DlstartTime1;
+    }
+
+    public void setNo2DlstartTime1(String no2DlstartTime1) {
+        this.no2DlstartTime1 = no2DlstartTime1;
+    }
+
+    public String getNo2DlstartTime2() {
+        return no2DlstartTime2;
+    }
+
+    public void setNo2DlstartTime2(String no2DlstartTime2) {
+        this.no2DlstartTime2 = no2DlstartTime2;
+    }
+
+    public String getNo2DlstartTime3() {
+        return no2DlstartTime3;
+    }
+
+    public void setNo2DlstartTime3(String no2DlstartTime3) {
+        this.no2DlstartTime3 = no2DlstartTime3;
+    }
+
+    public String getNo2DlstartTime4() {
+        return no2DlstartTime4;
+    }
+
+    public void setNo2DlstartTime4(String no2DlstartTime4) {
+        this.no2DlstartTime4 = no2DlstartTime4;
+    }
+
+    public String getNo3DlstartTime1() {
+        return no3DlstartTime1;
+    }
+
+    public void setNo3DlstartTime1(String no3DlstartTime1) {
+        this.no3DlstartTime1 = no3DlstartTime1;
+    }
+
+    public String getNo3DlstartTime2() {
+        return no3DlstartTime2;
+    }
+
+    public void setNo3DlstartTime2(String no3DlstartTime2) {
+        this.no3DlstartTime2 = no3DlstartTime2;
+    }
+
+    public String getNo3DlstartTime3() {
+        return no3DlstartTime3;
+    }
+
+    public void setNo3DlstartTime3(String no3DlstartTime3) {
+        this.no3DlstartTime3 = no3DlstartTime3;
+    }
+
+    public String getNo3DlstartTime4() {
+        return no3DlstartTime4;
+    }
+
+    public void setNo3DlstartTime4(String no3DlstartTime4) {
+        this.no3DlstartTime4 = no3DlstartTime4;
+    }
+
+    public String getNo4DlstartTime1() {
+        return no4DlstartTime1;
+    }
+
+    public void setNo4DlstartTime1(String no4DlstartTime1) {
+        this.no4DlstartTime1 = no4DlstartTime1;
+    }
+
+    public String getNo4DlstartTime2() {
+        return no4DlstartTime2;
+    }
+
+    public void setNo4DlstartTime2(String no4DlstartTime2) {
+        this.no4DlstartTime2 = no4DlstartTime2;
+    }
+
+    public String getNo4DlstartTime3() {
+        return no4DlstartTime3;
+    }
+
+    public void setNo4DlstartTime3(String no4DlstartTime3) {
+        this.no4DlstartTime3 = no4DlstartTime3;
+    }
+
+    public String getNo4DlstartTime4() {
+        return no4DlstartTime4;
+    }
+
+    public void setNo4DlstartTime4(String no4DlstartTime4) {
+        this.no4DlstartTime4 = no4DlstartTime4;
+    }
+
+    @Override
+    public String toString() {
+        return "MachineControlEntity{" +
+                "id=" + id +
+                ", jqId='" + jqId + '\'' +
+                ", no1DlstartTime1='" + no1DlstartTime1 + '\'' +
+                ", no1DlstartTime2='" + no1DlstartTime2 + '\'' +
+                ", no1DlstartTime3='" + no1DlstartTime3 + '\'' +
+                ", no1DlstartTime4='" + no1DlstartTime4 + '\'' +
+                ", no2DlstartTime1='" + no2DlstartTime1 + '\'' +
+                ", no2DlstartTime2='" + no2DlstartTime2 + '\'' +
+                ", no2DlstartTime3='" + no2DlstartTime3 + '\'' +
+                ", no2DlstartTime4='" + no2DlstartTime4 + '\'' +
+                ", no3DlstartTime1='" + no3DlstartTime1 + '\'' +
+                ", no3DlstartTime2='" + no3DlstartTime2 + '\'' +
+                ", no3DlstartTime3='" + no3DlstartTime3 + '\'' +
+                ", no3DlstartTime4='" + no3DlstartTime4 + '\'' +
+                ", no4DlstartTime1='" + no4DlstartTime1 + '\'' +
+                ", no4DlstartTime2='" + no4DlstartTime2 + '\'' +
+                ", no4DlstartTime3='" + no4DlstartTime3 + '\'' +
+                ", no4DlstartTime4='" + no4DlstartTime4 + '\'' +
+                '}';
+    }
+}

shiwan/admin/src/main/java/com/huimv/admin/dto/MachineControlDTO.java

@@ -0,0 +1,195 @@
+package com.huimv.admin.dto;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/1 19:30
+ * @Description
+ */
+public class MachineControlDTO {
+
+    private Integer id;
+
+    private String jqId;
+
+    private String no1DlstartTime1;
+
+    private String no1DlstartTime2;
+
+    private String no1DlstartTime3;
+
+    private String no1DlstartTime4;
+
+    private String no2DlstartTime1;
+
+    private String no2DlstartTime2;
+
+    private String no2DlstartTime3;
+
+    private String no2DlstartTime4;
+
+    private String no3DlstartTime1;
+
+    private String no3DlstartTime2;
+
+    private String no3DlstartTime3;
+
+    private String no3DlstartTime4;
+
+    private String no4DlstartTime1;
+
+    private String no4DlstartTime2;
+
+    private String no4DlstartTime3;
+
+    private String no4DlstartTime4;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public String getJqId() {
+        return jqId;
+    }
+
+    public void setJqId(String jqId) {
+        this.jqId = jqId;
+    }
+
+    public String getNo1DlstartTime1() {
+        return no1DlstartTime1;
+    }
+
+    public void setNo1DlstartTime1(String no1DlstartTime1) {
+        this.no1DlstartTime1 = no1DlstartTime1;
+    }
+
+    public String getNo1DlstartTime2() {
+        return no1DlstartTime2;
+    }
+
+    public void setNo1DlstartTime2(String no1DlstartTime2) {
+        this.no1DlstartTime2 = no1DlstartTime2;
+    }
+
+    public String getNo1DlstartTime3() {
+        return no1DlstartTime3;
+    }
+
+    public void setNo1DlstartTime3(String no1DlstartTime3) {
+        this.no1DlstartTime3 = no1DlstartTime3;
+    }
+
+    public String getNo1DlstartTime4() {
+        return no1DlstartTime4;
+    }
+
+    public void setNo1DlstartTime4(String no1DlstartTime4) {
+        this.no1DlstartTime4 = no1DlstartTime4;
+    }
+
+    public String getNo2DlstartTime1() {
+        return no2DlstartTime1;
+    }
+
+    public void setNo2DlstartTime1(String no2DlstartTime1) {
+        this.no2DlstartTime1 = no2DlstartTime1;
+    }
+
+    public String getNo2DlstartTime2() {
+        return no2DlstartTime2;
+    }
+
+    public void setNo2DlstartTime2(String no2DlstartTime2) {
+        this.no2DlstartTime2 = no2DlstartTime2;
+    }
+
+    public String getNo2DlstartTime3() {
+        return no2DlstartTime3;
+    }
+
+    public void setNo2DlstartTime3(String no2DlstartTime3) {
+        this.no2DlstartTime3 = no2DlstartTime3;
+    }
+
+    public String getNo2DlstartTime4() {
+        return no2DlstartTime4;
+    }
+
+    public void setNo2DlstartTime4(String no2DlstartTime4) {
+        this.no2DlstartTime4 = no2DlstartTime4;
+    }
+
+    public String getNo3DlstartTime1() {
+        return no3DlstartTime1;
+    }
+
+    public void setNo3DlstartTime1(String no3DlstartTime1) {
+        this.no3DlstartTime1 = no3DlstartTime1;
+    }
+
+    public String getNo3DlstartTime2() {
+        return no3DlstartTime2;
+    }
+
+    public void setNo3DlstartTime2(String no3DlstartTime2) {
+        this.no3DlstartTime2 = no3DlstartTime2;
+    }
+
+    public String getNo3DlstartTime3() {
+        return no3DlstartTime3;
+    }
+
+    public void setNo3DlstartTime3(String no3DlstartTime3) {
+        this.no3DlstartTime3 = no3DlstartTime3;
+    }
+
+    public String getNo3DlstartTime4() {
+        return no3DlstartTime4;
+    }
+
+    public void setNo3DlstartTime4(String no3DlstartTime4) {
+        this.no3DlstartTime4 = no3DlstartTime4;
+    }
+
+    public String getNo4DlstartTime1() {
+        return no4DlstartTime1;
+    }
+
+    public void setNo4DlstartTime1(String no4DlstartTime1) {
+        this.no4DlstartTime1 = no4DlstartTime1;
+    }
+
+    public String getNo4DlstartTime2() {
+        return no4DlstartTime2;
+    }
+
+    public void setNo4DlstartTime2(String no4DlstartTime2) {
+        this.no4DlstartTime2 = no4DlstartTime2;
+    }
+
+    public String getNo4DlstartTime3() {
+        return no4DlstartTime3;
+    }
+
+    public void setNo4DlstartTime3(String no4DlstartTime3) {
+        this.no4DlstartTime3 = no4DlstartTime3;
+    }
+
+    public String getNo4DlstartTime4() {
+        return no4DlstartTime4;
+    }
+
+    public void setNo4DlstartTime4(String no4DlstartTime4) {
+        this.no4DlstartTime4 = no4DlstartTime4;
+    }
+
+}

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

@@ -0,0 +1,16 @@
+package com.huimv.admin.repo.primary;
+
+import com.huimv.admin.domain.primary.DaJqda;
+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;
+
+public interface DaJqdaRepository extends JpaRepository<DaJqda, Integer>, JpaSpecificationExecutor<DaJqda> {
+
+    String findJQIDByZSID(Integer zsId);
+
+    DaJqda findAllByZSID(Integer zsId);
+}

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

@@ -0,0 +1,53 @@
+package com.huimv.admin.service.primary;
+
+import com.huimv.admin.dto.MachineControlDTO;
+import com.huimv.admin.utils.Result;
+import com.huimv.admin.vo.MachineControlVO;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/1 17:46
+ * @Description 料控管理Service Interface
+ */
+public interface MachineControlService {
+
+//    /**
+//     * 根据机器id查询料机信息
+//     * @param zsId
+//     * @return
+//     */
+//    Result listByZsId(Integer zsId);
+
+    /**
+     * 根据机器id保存或修改料机信息
+     * @param machineControlDTO
+     * @return
+     */
+    void save(MachineControlDTO machineControlDTO);
+
+    /**
+     * 分页条件列表查询
+     * @param pageNum
+     * @param pageSize
+     * @param keyword
+     * @return
+     */
+    Map<String,Object> list(Integer pageNum, Integer pageSize, String keyword);
+
+
+    /**
+     * 根据id删除
+     * @param id
+     */
+    void deleteById(Integer id);
+
+    /**
+     * 新增时选择猪舍的下拉框
+     * @return
+     */
+    List<String> selectBox4add();
+
+}

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

@@ -0,0 +1,100 @@
+package com.huimv.admin.service.primary.impl;
+
+import com.huimv.admin.domain.primary.DaJqda;
+import com.huimv.admin.domain.primary.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.vo.MachineControlVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/1 17:54
+ * @Description 料控管理Service
+ */
+@Service
+public class MachineControlServiceImpl implements MachineControlService {
+
+    @Autowired
+    private MachineControlRepository machineControlRepository;
+
+//    @Autowired
+//    private DaJqdaRepository daJqdaRepository;
+
+//    @Override
+//    public Result listByZsId(Integer zsId) {
+//        String jqId = daJqdaRepository.findJQIDByZSID(zsId);
+//        MachineControlEntity machineControlEntity = machineControlRepository.findByJqid(jqId);
+//        return new Result(ResultCode.SUCCESS, machineControlEntity);
+//    }
+
+    @Override
+    public void save(MachineControlDTO machineControlDTO) {
+        boolean isAdd = null == machineControlDTO.getId();
+        saveOrUpdateMachineControl(isAdd, machineControlDTO);
+    }
+
+    public void saveOrUpdateMachineControl(boolean isAdd, MachineControlDTO machineControlDTO) {
+
+        MachineControlEntity machineControlEntity = new MachineControlEntity();
+        machineControlEntity.setNo1DlstartTime1(machineControlDTO.getNo1DlstartTime1());
+        machineControlEntity.setNo1DlstartTime2(machineControlDTO.getNo1DlstartTime2());
+        machineControlEntity.setNo1DlstartTime3(machineControlDTO.getNo1DlstartTime3());
+        machineControlEntity.setNo1DlstartTime4(machineControlDTO.getNo1DlstartTime4());
+        machineControlEntity.setNo2DlstartTime1(machineControlDTO.getNo2DlstartTime1());
+        machineControlEntity.setNo2DlstartTime2(machineControlDTO.getNo2DlstartTime2());
+        machineControlEntity.setNo2DlstartTime3(machineControlDTO.getNo2DlstartTime3());
+        machineControlEntity.setNo2DlstartTime4(machineControlDTO.getNo2DlstartTime4());
+        machineControlEntity.setNo3DlstartTime1(machineControlDTO.getNo3DlstartTime1());
+        machineControlEntity.setNo3DlstartTime2(machineControlDTO.getNo3DlstartTime2());
+        machineControlEntity.setNo3DlstartTime3(machineControlDTO.getNo3DlstartTime3());
+        machineControlEntity.setNo3DlstartTime4(machineControlDTO.getNo3DlstartTime4());
+        machineControlEntity.setNo4DlstartTime1(machineControlDTO.getNo4DlstartTime1());
+        machineControlEntity.setNo4DlstartTime2(machineControlDTO.getNo4DlstartTime2());
+        machineControlEntity.setNo4DlstartTime3(machineControlDTO.getNo4DlstartTime3());
+        machineControlEntity.setNo4DlstartTime4(machineControlDTO.getNo4DlstartTime4());
+
+        if (isAdd) {
+            machineControlEntity.setJqId(machineControlDTO.getJqId());
+            machineControlRepository.saveAndFlush(machineControlEntity);
+            return;
+        }
+
+        machineControlEntity.setId(machineControlDTO.getId());
+        machineControlRepository.saveAndFlush(machineControlEntity);
+
+    }
+
+    @Override
+    public Map<String,Object> list(Integer pageNum, Integer pageSize, String keyword) {
+        Map<String,Object> map = new HashMap<>(16);
+        Long totalSize = machineControlRepository.countTotalSize(keyword);
+        map.put("totalSize",totalSize);
+        map.put("totalPageNum",(totalSize + pageSize - 1) / pageSize);
+        Integer start = (pageNum - 1) * pageSize;
+        List<MachineControlVO> machineControlInfoList = machineControlRepository.getMachineControlInfo(start, pageSize, keyword);
+        map.put("data",machineControlInfoList);
+        return map;
+    }
+
+    @Override
+    public void deleteById(Integer id) {
+        machineControlRepository.deleteById(id);
+    }
+
+    @Override
+    public List<String> selectBox4add() {
+        return machineControlRepository.selectZsList();
+    }
+
+
+}

shiwan/admin/src/main/java/com/huimv/admin/vo/MachineControlVO.java

@@ -0,0 +1,51 @@
+package com.huimv.admin.vo;
+
+import lombok.Data;
+
+/**
+ * @Author yinhao
+ * @Date 2021/4/1 20:48
+ * @Description 料控管理VO
+ */
+
+@Data
+public class MachineControlVO {
+
+    private Integer id;
+
+    private String ZSWC;
+
+    private String jqid;
+
+    private String no1DlstartTime1;
+
+    private String no1DlstartTime2;
+
+    private String no1DlstartTime3;
+
+    private String no1DlstartTime4;
+
+    private String no2DlstartTime1;
+
+    private String no2DlstartTime2;
+
+    private String no2DlstartTime3;
+
+    private String no2DlstartTime4;
+
+    private String no3DlstartTime1;
+
+    private String no3DlstartTime2;
+
+    private String no3DlstartTime3;
+
+    private String no3DlstartTime4;
+
+    private String no4DlstartTime1;
+
+    private String no4DlstartTime2;
+
+    private String no4DlstartTime3;
+
+    private String no4DlstartTime4;
+}