update

whycrzg

2021-02-02 ddbb6d74fd123c1b4468853d4392cb084cbbe4ae

update

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

@@ -28,21 +28,20 @@
    // 5.3删除包机组
    @DeleteMapping("/")
    @ApiOperation(notes = "",value="删除包机组")
    public ServiceModel delete(@RequestBody User_battgroup_baojigroup us) {
    public ServiceModel delete(@RequestParam Integer baoji_group_id,@RequestParam String baoji_group_name) {
        User_battgroup_baojigroup us = new User_battgroup_baojigroup();
        us.setBaoji_group_id(baoji_group_id);
        us.setBaoji_group_name(baoji_group_name);
        ServiceModel model=service.delete(us);
//        {
//            String msg="删除"+us.getBaoji_group_name()+"包机组";
//            User_log ulog=UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
//            uservice.add(ulog);//将用户的操作记录下来
//        }
		
        return model;
    }
    
    //5.3根据包机组id查对应的机房和电池组
    //5.3根据包机组id查对应的机房和电池组 100011
    @PostMapping("byInfo")
    @ApiOperation(notes = "",value="包机组id查对应的机房和电池组")
    public ServiceModel serchByInfo(@RequestBody User_battgroup_baojigroup us){
    public ServiceModel serchByInfo(@RequestParam Integer baoji_group_id) {
        User_battgroup_baojigroup us = new User_battgroup_baojigroup();
        us.setBaoji_group_id(baoji_group_id);
        ServiceModel model=service.serchByInfo(us);
        
        return model;
@@ -51,7 +50,9 @@
    //5.3根据包机组id查包机组对应的用户
    @PostMapping("byCondition")
    @ApiOperation(notes = "",value="包机组id查包机组对应的用户")
    public ServiceModel serchByCondition(@RequestBody User_battgroup_baojigroup us){
    public ServiceModel serchByCondition(@RequestParam Integer baoji_group_id) {
        User_battgroup_baojigroup us = new User_battgroup_baojigroup();
        us.setBaoji_group_id(baoji_group_id);
        ServiceModel model=service.serchByCondition(us);
        
        return model;
@@ -69,7 +70,10 @@
    // 5.3添加新包机组
    @PostMapping("/")
    @ApiOperation(notes = "",value="添加新包机组")
    public ServiceModel add(@RequestBody User_battgroup_baojigroup us) {
    public ServiceModel add(@RequestParam Integer baoji_group_id,@RequestParam String baoji_group_name) {
        User_battgroup_baojigroup us = new User_battgroup_baojigroup();
        us.setBaoji_group_id(baoji_group_id);
        us.setBaoji_group_name(baoji_group_name);
        ServiceModel model=service.add(us);
        {
            String msg="添加新的包机组为"+us.getBaoji_group_name();
@@ -83,7 +87,10 @@
    // 5.3修改包机组名
    @PutMapping("/")
    @ApiOperation(notes = "",value="修改包机组名")
    public ServiceModel update(@RequestBody User_battgroup_baojigroup us) {
    public ServiceModel update(@RequestParam Integer baoji_group_id,@RequestParam String baoji_group_name) {
        User_battgroup_baojigroup us = new User_battgroup_baojigroup();
        us.setBaoji_group_id(baoji_group_id);
        us.setBaoji_group_name(baoji_group_name);
        ServiceModel model=service.update(us);
        {
            String msg="修改"+us.getBaoji_group_name()+"包机组信息";

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

@@ -21,8 +21,10 @@

    //4.10根据User_battmaint_check的num查询User_battmaint_check_process对应的数据
    @PostMapping("byCondition")
    @ApiOperation(notes = "",value="根据User_battmaint_check的num查询User_battmaint_check_process对应的数据")
    public ServiceModel serchByCondition(@RequestBody User_battmaint_check ubc){
    @ApiOperation(notes = "where task_rec_id=#{num}",value="根据User_battmaint_check的num查询User_battmaint_check_process对应的数据")
    public ServiceModel serchByCondition(@RequestParam Integer num) {
        User_battmaint_check ubc = new User_battmaint_check();
        ubc.setNum(num);
        ServiceModel model=service.serchByCondition(ubc);
        return model;
    }

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

@@ -65,22 +65,20 @@
    public ServiceModel delete(User_battgroup_baojigroup obj) {
        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
        ServiceModel model= new ServiceModel();
        //TODO perry待查
        boolean bl=true;
        int i = mapper.delPro(obj);
        if (i > 0){
        }else{
            bl=false;
        try {
            bl = mapper.delPro(obj) > 0;
            if (bl) {
                bl = baojiGroupUserMapper.delAll(obj) > 0;
        }
        int i1 = baojiGroupUserMapper.delAll(obj);
        if (i1 > 0){
        }else{
            bl=false;
            if (bl) {
                bl = baojiGroupBattGroupMapper.delAll(obj) > 0;
        }
        int i2 = baojiGroupBattGroupMapper.delAll(obj);
        if (i2 >0){
        }else{
            bl=false;
        } catch (Exception e) {
            e.printStackTrace();
            dataSourceTransactionManager.rollback(transactionStatus);       //事务回滚
            model.setMsg("删除失败!");
            return model;
        }

        if(bl){
@@ -92,8 +90,7 @@
                User_log ulog= UinfDaoFactory.CreateULog(UinfDaoFactory.Delete, msg);
                uservice.add(ulog);//将用户的操作记录下来
            }
        }
        else{
        } else {
            dataSourceTransactionManager.rollback(transactionStatus);       //事务回滚
            model.setMsg("删除失败!");
        }

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

@@ -67,7 +67,10 @@
            User_inf uinf=new User_inf();
            usr_id=list.get(i).getUsr_id();
            uinf.setuId(usr_id);
            usr_name=((User_inf)userInfMapper.serchUname(uinf).get(0)).getuName();
            List<User_inf> user_infs = userInfMapper.serchUname(uinf);
            if (user_infs!=null&&user_infs.size()>0) {
                usr_name = user_infs.get(0).getuName();
            }
            list.get(i).setUsr_name(usr_name);
        }
        //System.out.println(list);