~whycxzp/fg_v1.1.git

parent: 8bec3dec | 补丁 | 提交 | ignore whitespace

whycrzg

2021-02-02 76f04402a726c1da002de99c5078b8272fa47a45

update

4个文件已修改

	src/main/java/com/fgkj/controller/Chart_ColorController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fgkj/controller/CustompageController.java	63 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fgkj/services/Chart_ColorService.java	58 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fgkj/services/CustompageService.java	63 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -42,10 +42,9 @@
    @GetMapping("byCondition")
    @ApiOperation(notes = "",value="查询用户对应得颜色组")
    public ServiceModel serchByCondition() {
        Object obj = (User_inf) ActionUtil.getUser();
        User_inf user = (User_inf) ActionUtil.getUser();
        ServiceModel model = new ServiceModel();
        if(obj!=null){
            User_inf user = (User_inf)obj;
        if(user!=null){
            Chart_Color ccolor = new Chart_Color();
            ccolor.setuId(user.getuId());
            model = service.serchByCondition(ccolor);

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

@@ -33,19 +33,20 @@
        
        return model;
    }
	

    //页面定制可以看到的子菜单和子模块
    @PutMapping("/")
    @ApiOperation(notes = "",value="页面定制可以看到的子菜单和子模块")
    @ApiOperation(notes = "[{ \"num\": 78, \"subflag\": 0, \"subenable\": 0 }]",value="页面定制可以看到的子菜单和子模块")
    public ServiceModel update(@RequestBody List<Custompage> list) {
        // List<Custompage> list = ActionUtil.getGson().fromJson(result, new TypeToken<ArrayList<Custompage>>(){}.getType() );
        ServiceModel model=service.update(list);		
		

        ServiceModel model = service.update(list);
        return model;
    }


    //页面定制修改主导航下子页面的顺序
    @PutMapping("order")
    @ApiOperation(notes = "",value="页面定制修改主导航下子页面的顺序")
    @ApiOperation(notes = "[{ \"num\": 78, \"page_order\": 0 }]",value="页面定制修改主导航下子页面的顺序")
    public ServiceModel updateOrder(@RequestBody List<Custompage> list) {
        // List<Custompage> list = ActionUtil.getGson().fromJson(result, new TypeToken<ArrayList<Custompage>>(){}.getType() );
        ServiceModel model=service.updateOrder(list);        
@@ -55,20 +56,22 @@
    }

    @DeleteMapping("/")
    @ApiOperation(notes = "",value="删除")
    public ServiceModel delete(@RequestBody Custompage cust) {
        ServiceModel model=service.delete(cust);
		
        return model;
    @ApiOperation(notes = "未完成功能",value="删除")
    public ServiceModel delete() {
//        Custompage cust = new Custompage();
//        ServiceModel model = service.delete(cust);

        return  new ServiceModel();
    }

    @GetMapping("byCondition")
    @PostMapping("byCondition")
    @ApiOperation(notes = "",value="页面查询子模块/子菜单")
    public ServiceModel serchByCondition(@RequestBody Custompage cust){
        // cust=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result,Custompage.class);
        ServiceModel model=service.serchByCondition(cust);
		
        //System.out.println(result);
    public ServiceModel serchByCondition(@RequestParam String navigate,@RequestParam Integer subjudge) {
        Custompage cust = new Custompage();
        cust.setNavigate(navigate);
        cust.setSubjudge(subjudge);
        ServiceModel model = service.serchByCondition(cust);

        return model;
    }

@@ -83,23 +86,27 @@
    }

    //根据主导航的名字查询所有的子页面
    @GetMapping("byInfo")
    @PostMapping("byInfo")
    @ApiOperation(notes = "",value="主导航的名字查询所有的子页")
    public ServiceModel serchByInfo(@RequestBody Custompage cust){
        // cust=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result,Custompage.class);
    public ServiceModel serchByInfo(@RequestParam String navigate){
        // "navigate": "Monitor_data"
        Custompage cust = new Custompage();
        cust.setNavigate(navigate);
        ServiceModel model=service.serchByInfo(cust);
        
        return model;
    }


    //将导航对象数组存入session
    @PostMapping("custom2Session")
    @ApiOperation(notes = "",value="将导航对象数组存入session")
    public static void setCust(ServiceModel obj){
                if(obj!=null){
                    ServiceModel model=(ServiceModel) obj;
                    ActionUtil.getSession().setAttribute("custompages", model.getData());
            ActionUtil.getSession().setAttribute("custompages_json", ActionUtil.tojson(model.getData()));
        }
    }
    @ApiOperation(notes = "参数:{ \"code\": 0, \"msg\": \"\", \"data\": {} } 返回值类型void",value="将导航对象数组存入session")
    public static void setCust(ServiceModel obj) {
        if (obj != null) {
            ServiceModel model = (ServiceModel) obj;
            ActionUtil.getSession().setAttribute("custompages", model.getData());
            ActionUtil.getSession().setAttribute("custompages_json", ActionUtil.tojson(model.getData()));
        }
    }
    
}

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

@@ -19,31 +19,49 @@
    
    //修改用户的颜色组
    public ServiceModel update(Chart_Color obj) {
        List list=mapper.serchByCondition(obj);
        if(list!=null&&list.size()>0){
            boolean bl=mapper.update(obj)>0;
            if(bl){
                model.setCode(1);
                model.setMsg("修改成功");
            }else{
                model.setCode(0);
                model.setMsg("修改失败");
            }
        }else{
            boolean bl=mapper.add(obj)>0;
            if(bl){
                model.setCode(1);
                model.setMsg("添加成功");
            }else{
                model.setCode(0);
                model.setMsg("添加失败");
            }
        ServiceModel model = new ServiceModel();
        List list = mapper.serchByCondition(obj);
        if (list != null && list.size() > 0) {
            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 {
                model.setCode(0);
                model.setMsg("修改失败");
            }
        } else {
            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 {
                model.setCode(0);
                model.setMsg("添加失败");
            }

        }
        }
        return model;
    }
    //查询用户对应得颜色组
    public ServiceModel serchByCondition(Chart_Color obj) {
        ServiceModel model = new ServiceModel();
        List list=mapper.serchByCondition(obj);
        if(list!=null&&list.size()>0){
            model.setCode(1);

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

@@ -22,41 +22,55 @@
    //页面定制下添加导航或者子页面
    public ServiceModel add(Custompage 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.setMsg("添加失败!");
        }
        return model;
		

    }
    //页面定制可以看到的子菜单和子模块
    public ServiceModel update(List<Custompage> obj) {
    public ServiceModel update(List<Custompage> list) {
        ServiceModel model = new ServiceModel();
        List<Custompage> list=(List) obj;
        Boolean bl=true;
        if(list.size()>0&&list!=null){
            for(int i=0;i<list.size();i++){
                if(list.get(i).getSubenable()==0){
                    Custompage cpage=new Custompage();
                    cpage.setNum(list.get(i).getNum());
                    cpage.setSubflag(list.get(i).getSubflag());
                    //System.out.println(cpage);
                    bl=mapper.update(cpage)>0 && bl;
        Boolean bl = true;
        if (list.size() > 0 && list != null) {
            for (int i = 0; i < list.size(); i++) {
                try {
                    if (list.get(i).getSubenable() == 0) {
                        Custompage cpage = new Custompage();
                        cpage.setNum(list.get(i).getNum());
                        cpage.setSubflag(list.get(i).getSubflag());
                        //System.out.println(cpage);
                        bl = mapper.update(cpage) > 0 && bl;
                    }
                } catch (Exception e) {
                    e.printStackTrace();
                    model.setCode(0);
                    model.setMsg("修改失败!");
                    return model;
                }
            }
        }
        if(bl){
        if (bl) {
            model.setCode(1);
            model.setMsg("修改成功!");
        }else{
        } else {
            model.setMsg("修改失败!");
        }
        //System.out.println(bl);
        return model;	
        return model;
    }
    //页面定制修改主导航下子页面的顺序
    public ServiceModel updateOrder(List<Custompage> obj) {
@@ -64,8 +78,15 @@
        List<Custompage> list=(List) obj;
        Boolean bl=true;
        if(list.size()>0&&list!=null){
            for(int i=0;i<list.size();i++){					
                bl=mapper.updateOrder(list.get(i))>0 && bl;
            for(int i=0;i<list.size();i++){
                try {
                    bl=mapper.updateOrder(list.get(i))>0 && bl;
                } catch (Exception e) {
                    e.printStackTrace();
                    model.setCode(0);
                    model.setMsg("修改失败!");
                    return model;
                }
            }
        }
        if(bl){

			@@ -42,10 +42,9 @@
			@GetMapping("byCondition")
			@ApiOperation(notes = "",value="查询用户对应得颜色组")
			public ServiceModel serchByCondition() {
			Object obj = (User_inf) ActionUtil.getUser();
			User_inf user = (User_inf) ActionUtil.getUser();
			ServiceModel model = new ServiceModel();
			if(obj!=null){
			User_inf user = (User_inf)obj;
			if(user!=null){
			Chart_Color ccolor = new Chart_Color();
			ccolor.setuId(user.getuId());
			model = service.serchByCondition(ccolor);

			@@ -33,19 +33,20 @@

			return model;
			}


			//页面定制可以看到的子菜单和子模块
			@PutMapping("/")
			@ApiOperation(notes = "",value="页面定制可以看到的子菜单和子模块")
			@ApiOperation(notes = "[{ \"num\": 78, \"subflag\": 0, \"subenable\": 0 }]",value="页面定制可以看到的子菜单和子模块")
			public ServiceModel update(@RequestBody List<Custompage> list) {
			// List<Custompage> list = ActionUtil.getGson().fromJson(result, new TypeToken<ArrayList<Custompage>>(){}.getType() );
			ServiceModel model=service.update(list);


			ServiceModel model = service.update(list);
			return model;
			}


			//页面定制修改主导航下子页面的顺序
			@PutMapping("order")
			@ApiOperation(notes = "",value="页面定制修改主导航下子页面的顺序")
			@ApiOperation(notes = "[{ \"num\": 78, \"page_order\": 0 }]",value="页面定制修改主导航下子页面的顺序")
			public ServiceModel updateOrder(@RequestBody List<Custompage> list) {
			// List<Custompage> list = ActionUtil.getGson().fromJson(result, new TypeToken<ArrayList<Custompage>>(){}.getType() );
			ServiceModel model=service.updateOrder(list);
			@@ -55,20 +56,22 @@
			}

			@DeleteMapping("/")
			@ApiOperation(notes = "",value="删除")
			public ServiceModel delete(@RequestBody Custompage cust) {
			ServiceModel model=service.delete(cust);

			return model;
			@ApiOperation(notes = "未完成功能",value="删除")
			public ServiceModel delete() {
			// Custompage cust = new Custompage();
			// ServiceModel model = service.delete(cust);

			return new ServiceModel();
			}

			@GetMapping("byCondition")
			@PostMapping("byCondition")
			@ApiOperation(notes = "",value="页面查询子模块/子菜单")
			public ServiceModel serchByCondition(@RequestBody Custompage cust){
			// cust=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result,Custompage.class);
			ServiceModel model=service.serchByCondition(cust);

			//System.out.println(result);
			public ServiceModel serchByCondition(@RequestParam String navigate,@RequestParam Integer subjudge) {
			Custompage cust = new Custompage();
			cust.setNavigate(navigate);
			cust.setSubjudge(subjudge);
			ServiceModel model = service.serchByCondition(cust);

			return model;
			}

			@@ -83,23 +86,27 @@
			}

			//根据主导航的名字查询所有的子页面
			@GetMapping("byInfo")
			@PostMapping("byInfo")
			@ApiOperation(notes = "",value="主导航的名字查询所有的子页")
			public ServiceModel serchByInfo(@RequestBody Custompage cust){
			// cust=ActionUtil.getGson("yyyy-MM-dd HH:mm:ss").fromJson(result,Custompage.class);
			public ServiceModel serchByInfo(@RequestParam String navigate){
			// "navigate": "Monitor_data"
			Custompage cust = new Custompage();
			cust.setNavigate(navigate);
			ServiceModel model=service.serchByInfo(cust);

			return model;
			}


			//将导航对象数组存入session
			@PostMapping("custom2Session")
			@ApiOperation(notes = "",value="将导航对象数组存入session")
			public static void setCust(ServiceModel obj){
			if(obj!=null){
			ServiceModel model=(ServiceModel) obj;
			ActionUtil.getSession().setAttribute("custompages", model.getData());
			ActionUtil.getSession().setAttribute("custompages_json", ActionUtil.tojson(model.getData()));
			}
			}
			@ApiOperation(notes = "参数:{ \"code\": 0, \"msg\": \"\", \"data\": {} } 返回值类型void",value="将导航对象数组存入session")
			public static void setCust(ServiceModel obj) {
			if (obj != null) {
			ServiceModel model = (ServiceModel) obj;
			ActionUtil.getSession().setAttribute("custompages", model.getData());
			ActionUtil.getSession().setAttribute("custompages_json", ActionUtil.tojson(model.getData()));
			}
			}

			}

			@@ -19,31 +19,49 @@

			//修改用户的颜色组
			public ServiceModel update(Chart_Color obj) {
			List list=mapper.serchByCondition(obj);
			if(list!=null&&list.size()>0){
			boolean bl=mapper.update(obj)>0;
			if(bl){
			model.setCode(1);
			model.setMsg("修改成功");
			}else{
			model.setCode(0);
			model.setMsg("修改失败");
			}
			}else{
			boolean bl=mapper.add(obj)>0;
			if(bl){
			model.setCode(1);
			model.setMsg("添加成功");
			}else{
			model.setCode(0);
			model.setMsg("添加失败");
			}
			ServiceModel model = new ServiceModel();
			List list = mapper.serchByCondition(obj);
			if (list != null && list.size() > 0) {
			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 {
			model.setCode(0);
			model.setMsg("修改失败");
			}
			} else {
			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 {
			model.setCode(0);
			model.setMsg("添加失败");
			}

			}
			}
			return model;
			}
			//查询用户对应得颜色组
			public ServiceModel serchByCondition(Chart_Color obj) {
			ServiceModel model = new ServiceModel();
			List list=mapper.serchByCondition(obj);
			if(list!=null&&list.size()>0){
			model.setCode(1);

			@@ -22,41 +22,55 @@
			//页面定制下添加导航或者子页面
			public ServiceModel add(Custompage 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.setMsg("添加失败!");
			}
			return model;


			}
			//页面定制可以看到的子菜单和子模块
			public ServiceModel update(List<Custompage> obj) {
			public ServiceModel update(List<Custompage> list) {
			ServiceModel model = new ServiceModel();
			List<Custompage> list=(List) obj;
			Boolean bl=true;
			if(list.size()>0&&list!=null){
			for(int i=0;i<list.size();i++){
			if(list.get(i).getSubenable()==0){
			Custompage cpage=new Custompage();
			cpage.setNum(list.get(i).getNum());
			cpage.setSubflag(list.get(i).getSubflag());
			//System.out.println(cpage);
			bl=mapper.update(cpage)>0 && bl;
			Boolean bl = true;
			if (list.size() > 0 && list != null) {
			for (int i = 0; i < list.size(); i++) {
			try {
			if (list.get(i).getSubenable() == 0) {
			Custompage cpage = new Custompage();
			cpage.setNum(list.get(i).getNum());
			cpage.setSubflag(list.get(i).getSubflag());
			//System.out.println(cpage);
			bl = mapper.update(cpage) > 0 && bl;
			}
			} catch (Exception e) {
			e.printStackTrace();
			model.setCode(0);
			model.setMsg("修改失败!");
			return model;
			}
			}
			}
			if(bl){
			if (bl) {
			model.setCode(1);
			model.setMsg("修改成功!");
			}else{
			} else {
			model.setMsg("修改失败!");
			}
			//System.out.println(bl);
			return model;
			return model;
			}
			//页面定制修改主导航下子页面的顺序
			public ServiceModel updateOrder(List<Custompage> obj) {
			@@ -64,8 +78,15 @@
			List<Custompage> list=(List) obj;
			Boolean bl=true;
			if(list.size()>0&&list!=null){
			for(int i=0;i<list.size();i++){
			bl=mapper.updateOrder(list.get(i))>0 && bl;
			for(int i=0;i<list.size();i++){
			try {
			bl=mapper.updateOrder(list.get(i))>0 && bl;
			} catch (Exception e) {
			e.printStackTrace();
			model.setCode(0);
			model.setMsg("修改失败!");
			return model;
			}
			}
			}
			if(bl){