update Fbs9600_state and relatedReference

whycrzh

2021-01-28 2ae8e060fb88e2814c63bfbdedb9c891a6fce37a

update Fbs9600_state and relatedReference

 src/main/java/com/fgkj/controller/Batt_DevdischargeController.java

@@ -9,13 +9,15 @@
import com.fgkj.services.User_logService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.Date;

@RequestMapping("battDevDischarge")
@RestController
@Api(tags = "battDevDischarge接口")
@Api(tags = "battDevDischarge接口 TODO")
public class Batt_DevdischargeController{

    @Resource
@@ -24,9 +26,8 @@
    private User_logService uservice;

    @PostMapping("/")
    @ApiOperation(notes = "",value="新增")
    @ApiOperation(notes = "{ \"dev_id\": 0, \"dev_name\": \"dev_name\", \"dev_recordtime\": \"2021-01-07 08:16:26\", \"dev_vol\": 0.0, \"dev_curr\": 0.0, \"dev_power\": 0.0, \"note\": \"c\" }",value="新增")
    public ServiceModel add(@RequestBody Batt_Devdischarge bd){
        // Batt_Devdischarge bd = getGson("yyyy-MM-dd").fromJson(json, Batt_Devdischarge.class);
        ServiceModel model = service.add(bd);
        {
            String msg="添加对"+bd.getDev_name()+"设备的记录";
@@ -38,7 +39,7 @@
    }

    @PutMapping("/")
    @ApiOperation(notes = "",value="修改")
    @ApiOperation(notes = "{ \"num\": 33308, \"dev_id\": 0, \"dev_name\": \"\", \"dev_recordtime\": \"2021-01-07 08:16:26\", \"dev_vol\": 0.0, \"dev_curr\": 0.0, \"dev_power\": 0.0, \"note\": \"\" }",value="修改")
    public ServiceModel update(@RequestBody Batt_Devdischarge bd){
        // Batt_Devdischarge bd = getGson("yyyy-MM-dd").fromJson(json, Batt_Devdischarge.class);
        ServiceModel model = service.update(bd);
@@ -48,7 +49,9 @@

    @DeleteMapping("/")
    @ApiOperation(notes = "",value="删除")
    public ServiceModel del(@RequestBody Batt_Devdischarge bd){
    public ServiceModel del(@RequestParam Integer num){
        Batt_Devdischarge bd= new Batt_Devdischarge();
        bd.setNum(num);
//         Batt_Devdischarge bd = getGson("yyyy-MM-dd").fromJson(json, Batt_Devdischarge.class);
        ServiceModel model = service.del(bd);

@@ -56,7 +59,7 @@
    }

    @GetMapping("all")
    @ApiOperation(notes = "",value="all")
    @ApiOperation(notes = "数据较大，是否分页？Total: 33297",value="all")
    public ServiceModel searchAll(){
        ServiceModel model = service.searchAll();

@@ -68,9 +71,13 @@
    /*
     * 记录时间放在battinf的battproducer
     * 统计类型放在moncount中：  1：电压，2电流，3功率*/
    @GetMapping("byCondition")
    public ServiceModel serchByCondition(@RequestBody BattInf binf){
        // BattInf binf = getGson("yyyy-MM-dd HH:mm:ss").fromJson(json, BattInf.class);
    @PostMapping("byCondition")
    @ApiOperation(notes = "记录时间放在battinf的battproducer 统计类型放在moncount中：1：电压，2电流，3功率", value = "设备id连battinf和batt_devdischarge表")
    public ServiceModel serchByCondition(@ApiParam(value = "设备id 42010007", required = true) @RequestParam String stationId, @ApiParam(value = "生产日期段 格式2000/01/28 08:22:34", required = true) @RequestParam Date battProductDate, @ApiParam(value = "生产日期段", required = true) @RequestParam Date battProductDate1) {
        BattInf binf = new BattInf();
        binf.setStationId(stationId);
        binf.setBattProductDate(battProductDate);
        binf.setBattProductDate1(battProductDate1);
        //System.out.println(binf);
        ServiceModel model = service.serchByCondition(binf);


 src/main/java/com/fgkj/services/Batt_DevdischargeService.java

@@ -73,28 +73,50 @@
     * MonCount：当前页
     * MonNum ：页面的大小
     */
    public ServiceModel serchByCondition(BattInf obj){
    public ServiceModel serchByCondition(BattInf binf) {
        ServiceModel model = new ServiceModel();
        BattInf binf=(BattInf) obj;
        binf.setNum(0);
        binf.setMonCount(0);
        binf.setMonNum(0);
        List<Batt_Devdischarge> listN=mapper.serchMaxAndMinNum(binf);
        if(listN!=null&&listN.size()>0){
            float number=listN.get(listN.size()-1).getDev_curr();
            float maxnum=listN.get(listN.size()-1).getDev_power();
            float minnum=listN.get(listN.size()-1).getDev_vol();
        List<Batt_Devdischarge> listN = mapper.serchMaxAndMinNum(binf);
        boolean searchFlag=true;
        if (listN != null && listN.size() > 0) {
            System.out.println("listN = " + listN);
            Float dev_curr = listN.get(listN.size() - 1).getDev_curr();
            float number = -1;
            if (dev_curr != null) {
                number = dev_curr;
            }else{
                searchFlag=false;
            }
            Float dev_power = listN.get(listN.size() - 1).getDev_power();
            float maxnum = -1;
            if (dev_power != null) {
                maxnum = dev_power;
            }else{
                searchFlag=false;
            }
            Float dev_vol = listN.get(listN.size() - 1).getDev_vol();
            float minnum = -1;
            if (dev_vol != null) {
                minnum = dev_vol;
            }else{
                searchFlag=false;
            }
            binf.setNum((int) number);
            binf.setMonCount((int) maxnum);
            binf.setMonNum((int) minnum);
        }//LIMIT 1 只有一条数据
        List<Batt_Devdischarge_all> list=mapper.serchByCondition(binf);
        }
        List<Batt_Devdischarge_all> list = null;
        if (searchFlag){
            list = mapper.serchByCondition(binf);
        }
        //System.out.println(list.size());
        if(list!=null && list.size()>0){
        if (list != null && list.size() > 0) {
            model.setCode(1);
            model.setMsg("查询成功!");
            model.setData(list);
        }else{
        } else {
            model.setCode(0);
            model.setMsg("查询失败!");
        }