whycrzg
2021-02-02 1454315d5d542284f233a949f32a1b1f74f57916
update
4个文件已修改
88 ■■■■■ 已修改文件
src/main/java/com/fgkj/controller/Devstate_usrController.java 23 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/controller/MapController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/Devstate_usrService.java 42 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/services/MapService.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fgkj/controller/Devstate_usrController.java
@@ -23,9 +23,8 @@
    //添加
    @PostMapping("/")
    @ApiOperation(notes = "",value="添加")
    @ApiOperation(notes = "uid 从session中获取 { \"dev_id\": 0, \"battgroupid\": 0, \"batt_index\": 0, \"stationname\": \"\", \"battgroupname\": \"\" }",value="添加")
    public ServiceModel add(@RequestBody Devstate_usr dev_usr) {
        // Devstate_usr dev_usr=getGson().fromJson(json, Devstate_usr.class);
        User_inf uinf = (User_inf)ActionUtil.getUser();
        dev_usr.setuId(uinf.getuId());
        ServiceModel model=service.add(dev_usr);
@@ -33,10 +32,10 @@
        return model;
        
    }
    //修改
    @PutMapping("/")
    @ApiOperation(notes = "",value="修改")
    @ApiOperation(notes = "uid 从session中获取 修改条件uid dev_id { \"dev_id\": 0, \"battgroupid\": 0, \"batt_index\": 0, \"stationname\": \"\", \"battgroupname\": \"\" }",value="修改")
    public ServiceModel update(@RequestBody Devstate_usr dev_usr) {
        // Devstate_usr dev_usr=getGson().fromJson(json, Devstate_usr.class);
        User_inf uinf = (User_inf)ActionUtil.getUser();
@@ -49,18 +48,20 @@
    //删除
    @DeleteMapping("/")
    @ApiOperation(notes = "",value="删除")
    public ServiceModel del(@RequestBody Devstate_usr dev_usr) {
        User_inf uinf = (User_inf)ActionUtil.getUser();
        // Devstate_usr dev_usr=getGson().fromJson(json, Devstate_usr.class);
    public ServiceModel del(@RequestParam Integer dev_id,@RequestParam Integer battgroupid) {
        Devstate_usr dev_usr = new Devstate_usr();
        User_inf uinf = (User_inf) ActionUtil.getUser();
        dev_usr.setuId(uinf.getuId());
        ServiceModel model=service.del(dev_usr);
        dev_usr.setDev_id(dev_id);
        dev_usr.setBattgroupid(battgroupid);
        ServiceModel model = service.del(dev_usr);
        return model;
    }
    //根据用户id查询
    @GetMapping("byCondition")
    @ApiOperation(notes = "",value="用户id查询")
    @PostMapping("byCondition")
    @ApiOperation(notes = "根据session中的用户id查询",value="用户id查询")
    public ServiceModel serchByCondition() {
        User_inf uinf = (User_inf)ActionUtil.getUser();
        Devstate_usr dev_usr = new Devstate_usr();
src/main/java/com/fgkj/controller/MapController.java
@@ -30,7 +30,7 @@
    @PostMapping("byCondition")
    @ApiOperation(notes = "",value="uid查map信息")
    public ServiceModel serchByCondition(){
        User_inf user=(User_inf)ActionUtil.getSession().getAttribute("user");
        User_inf user=(User_inf)ActionUtil.getUser();
        ServiceModel model=new ServiceModel();
//        User_inf user=new User_inf();
//        user.setuId(1002);
src/main/java/com/fgkj/services/Devstate_usrService.java
@@ -18,11 +18,19 @@
    //添加
    public ServiceModel add(Devstate_usr obj) {
        ServiceModel model = new ServiceModel();
        boolean bl=mapper.add(obj)>0;
        if(bl){
        boolean bl = true;
        try {
            bl = mapper.add(obj) > 0;
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("添加失败");
            return model;
        }
        if (bl) {
            model.setCode(1);
            model.setMsg("添加成功");
        }else{
        } else {
            model.setCode(0);
            model.setMsg("添加失败");
        }
@@ -31,11 +39,19 @@
    //修改
    public ServiceModel update(Devstate_usr obj) {
        ServiceModel model = new ServiceModel();
        boolean bl=mapper.update(obj)>0;
        if(bl){
        boolean bl = true;
        try {
            bl = mapper.update(obj) > 0;
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("修改失败");
            return model;
        }
        if (bl) {
            model.setCode(1);
            model.setMsg("修改成功");
        }else{
        } else {
            model.setCode(0);
            model.setMsg("修改失败");
        }
@@ -44,11 +60,19 @@
    //删除
    public ServiceModel del(Devstate_usr obj) {
        ServiceModel model = new ServiceModel();
        boolean bl=mapper.del(obj)>0;
        if(bl){
        boolean bl = true;
        try {
            bl = mapper.del(obj) > 0;
        } catch (Exception e) {
            e.printStackTrace();
            model.setCode(0);
            model.setMsg("删除失败");
            return model;
        }
        if (bl) {
            model.setCode(1);
            model.setMsg("删除成功");
        }else{
        } else {
            model.setCode(0);
            model.setMsg("删除失败");
        }
src/main/java/com/fgkj/services/MapService.java
@@ -53,19 +53,20 @@
    }*/
    //0.7/0.8根据uid查map信息
     public ServiceModel serchByCondition(User_inf obj){
        List<TBMap> list=mapper.serchByCondition(obj);
     public ServiceModel serchByCondition(User_inf obj) {
         ServiceModel model = new ServiceModel();
         List<TBMap> list = mapper.serchByCondition(obj);
//        for (Object object : list) {
//            System.out.println(object);
//        }
        if(list!=null && list.size()>0){
            model.setCode(1);
            model.setData(list);
        }
        //System.out.println(model);
        return model;
    }
         if (list != null && list.size() > 0) {
             model.setCode(1);
             model.setData(list);
         }
         //System.out.println(model);
         return model;
     }
    /*public ServiceModel searchAll(){