diff --git a/pom.xml b/pom.xml index 53852ee4..20c4c10a 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,8 @@ 1.4.6 1.2.16 3.5.2 - 2.13.0 + 2.16.1 + 1.18.16 2.3 2.0.23 0.9.1 diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonData.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonData.java new file mode 100644 index 00000000..f7651a47 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonData.java @@ -0,0 +1,170 @@ +package com.yanzhu.manage.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; + +import java.util.Date; +/** + * 建碳管理对象 green_carbon_data + * + * @author yanzhu + * @date 2024-12-07 + */ +public class GreenCarbonData extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 公司主键 */ + @Excel(name = "公司主键") + private Long comId; + + /** 分包单位 */ + @Excel(name = "分包单位") + private Long projectId; + + /** 因子ID-外键 */ + @Excel(name = "因子ID-外键") + private Long itemId; + + /** 预估使用数量 */ + @Excel(name = "预估使用数量") + private Long estimateValue; + + /** 实际使用量 */ + @Excel(name = " 实际使用量") + private Long practicalValue; + + /** 状态 */ + @Excel(name = "状态") + private Long state; + + /** $column.columnComment */ + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") + private Long isDel; + + private GreenCarbonItem greenCarbonItem; + + public GreenCarbonItem getGreenCarbonItem() { + return greenCarbonItem; + } + + public void setGreenCarbonItem(GreenCarbonItem greenCarbonItem) { + this.greenCarbonItem = greenCarbonItem; + } + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setComId(Long comId) + { + this.comId = comId; + } + + public Long getComId() + { + return comId; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setItemId(Long itemId) + { + this.itemId = itemId; + } + + public Long getItemId() + { + return itemId; + } + public void setEstimateValue(Long estimateValue) + { + this.estimateValue = estimateValue; + } + + public Long getEstimateValue() + { + return estimateValue; + } + public void setPracticalValue(Long practicalValue) + { + this.practicalValue = practicalValue; + } + + public Long getPracticalValue() + { + return practicalValue; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + private String projectName; + private String compName; + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getCompName() { + return compName; + } + + public void setCompName(String compName) { + this.compName = compName; + } + + public Long getIsDel() + { + return isDel; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("comId", getComId()) + .append("projectId", getProjectId()) + .append("itemId", getItemId()) + .append("estimateValue", getEstimateValue()) + .append("practicalValue", getPracticalValue()) + .append("state", getState()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonItem.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonItem.java new file mode 100644 index 00000000..e22e71d1 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/GreenCarbonItem.java @@ -0,0 +1,195 @@ +package com.yanzhu.manage.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.yanzhu.common.core.annotation.Excel; +import com.yanzhu.common.core.web.domain.BaseEntity; + +import java.util.Date; + +/** + * 碳因子管理对象 green_carbon_item + * + * @author yanzhu + * @date 2024-12-07 + */ +public class GreenCarbonItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + @Excel(name = "ID(有ID进行更新,无ID进行增加)") + private Long id; + + @Excel(name = "公司") + private String compName; + /** 公司主键 */ + @Excel(name = "公司ID") + private Long comId; + @Excel(name = "分包单位") + private String projectName; + /** $column.columnComment */ + + /** 分包单位 */ + @Excel(name = "分包单位ID") + private Long projectId; + + /** 碳因子类型 */ + @Excel(name = "碳因子类型1-建筑材料2-油料3-电") + private Long carbonFactorType; + /** 碳因子类型 */ + @Excel(name = "碳因子类型") + private String factorType; + /** 名称 */ + @Excel(name = "名称") + private String carbonName; + + /** 单位 */ + @Excel(name = "单位") + private String unit; + + /** 碳排放因子 */ + @Excel(name = "碳排放因子") + private Long carbonFactor; + @Excel(name = "说明") + private String remark; + + @Override + public String getRemark() { + return remark; + } + + @Override + public void setRemark(String remark) { + this.remark = remark; + } + + private Long state; + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public String getCompName() { + return compName; + } + + public void setCompName(String compName) { + this.compName = compName; + } + + private Long isDel; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setComId(Long comId) + { + this.comId = comId; + } + + public Long getComId() + { + return comId; + } + public void setProjectId(Long projectId) + { + this.projectId = projectId; + } + + public Long getProjectId() + { + return projectId; + } + public void setCarbonFactorType(Long carbonFactorType) + { + this.carbonFactorType = carbonFactorType; + } + + public Long getCarbonFactorType() + { + return carbonFactorType; + } + public void setCarbonName(String carbonName) + { + this.carbonName = carbonName; + } + + public String getCarbonName() + { + return carbonName; + } + public void setUnit(String unit) + { + this.unit = unit; + } + + public String getUnit() + { + return unit; + } + public void setCarbonFactor(Long carbonFactor) + { + this.carbonFactor = carbonFactor; + } + + public Long getCarbonFactor() + { + return carbonFactor; + } + public void setState(Long state) + { + this.state = state; + } + + public Long getState() + { + return state; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + + public String getFactorType() { + return factorType; + } + + public void setFactorType(String factorType) { + this.factorType = factorType; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("comId", getComId()) + .append("projectId", getProjectId()) + .append("carbonFactorType", getCarbonFactorType()) + .append("carbonName", getCarbonName()) + .append("unit", getUnit()) + .append("carbonFactor", getCarbonFactor()) + .append("state", getState()) + .append("remark", getRemark()) + .append("isDel", getIsDel()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/GreenCarbonDataMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/GreenCarbonDataMapper.java new file mode 100644 index 00000000..f8c51c1b --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/GreenCarbonDataMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.GreenCarbonData; + +/** + * 建碳管理Mapper接口 + * + * @author yanzhu + * @date 2024-12-07 + */ +public interface GreenCarbonDataMapper +{ + /** + * 查询建碳管理 + * + * @param id 建碳管理主键 + * @return 建碳管理 + */ + public GreenCarbonData selectGreenCarbonDataById(Long id); + + /** + * 查询建碳管理列表 + * + * @param greenCarbonData 建碳管理 + * @return 建碳管理集合 + */ + public List selectGreenCarbonDataList(GreenCarbonData greenCarbonData); + + /** + * 新增建碳管理 + * + * @param greenCarbonData 建碳管理 + * @return 结果 + */ + public int insertGreenCarbonData(GreenCarbonData greenCarbonData); + + /** + * 修改建碳管理 + * + * @param greenCarbonData 建碳管理 + * @return 结果 + */ + public int updateGreenCarbonData(GreenCarbonData greenCarbonData); + + /** + * 删除建碳管理 + * + * @param id 建碳管理主键 + * @return 结果 + */ + public int deleteGreenCarbonDataById(Long id); + + /** + * 批量删除建碳管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteGreenCarbonDataByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/GreenCarbonItemMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/GreenCarbonItemMapper.java new file mode 100644 index 00000000..0e6e7955 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/GreenCarbonItemMapper.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.mapper; + +import java.util.List; +import com.yanzhu.manage.domain.GreenCarbonItem; + +/** + * 碳因子管理Mapper接口 + * + * @author yanzhu + * @date 2024-12-07 + */ +public interface GreenCarbonItemMapper +{ + /** + * 查询碳因子管理 + * + * @param id 碳因子管理主键 + * @return 碳因子管理 + */ + public GreenCarbonItem selectGreenCarbonItemById(Long id); + + /** + * 查询碳因子管理列表 + * + * @param greenCarbonItem 碳因子管理 + * @return 碳因子管理集合 + */ + public List selectGreenCarbonItemList(GreenCarbonItem greenCarbonItem); + + /** + * 新增碳因子管理 + * + * @param greenCarbonItem 碳因子管理 + * @return 结果 + */ + public int insertGreenCarbonItem(GreenCarbonItem greenCarbonItem); + + /** + * 修改碳因子管理 + * + * @param greenCarbonItem 碳因子管理 + * @return 结果 + */ + public int updateGreenCarbonItem(GreenCarbonItem greenCarbonItem); + + /** + * 删除碳因子管理 + * + * @param id 碳因子管理主键 + * @return 结果 + */ + public int deleteGreenCarbonItemById(Long id); + + /** + * 批量删除碳因子管理 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteGreenCarbonItemByIds(Long[] ids); +} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/GreenCarbonDataMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/GreenCarbonDataMapper.xml new file mode 100644 index 00000000..6a7ce865 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/GreenCarbonDataMapper.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select gd.id, gd.com_id, gd.project_id, gd.item_id, gd.estimate_value, gd.practical_value, gd.state, + gd.remark, gd.is_del, gd.create_by, gd.create_time, gd.update_by, gd.update_time, + dp.`dept_name` comp_name,pi.`project_name`,g.id gid,g.carbon_factor_type,g.carbon_name,g.unit,g.carbon_factor + from green_carbon_data gd + LEFT JOIN sys_dept dp ON gd.`com_id`=dp.`dept_id` + LEFT JOIN pro_project_info pi ON gd.`project_id`=pi.`id` + LEFT JOIN green_carbon_item g on g.id=gd.item_id + + + + + + + + insert into green_carbon_data + + com_id, + project_id, + item_id, + estimate_value, + practical_value, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{comId}, + #{projectId}, + #{itemId}, + #{estimateValue}, + #{practicalValue}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update green_carbon_data + + com_id = #{comId}, + project_id = #{projectId}, + item_id = #{itemId}, + estimate_value = #{estimateValue}, + practical_value = #{practicalValue}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from green_carbon_data where id = #{id} + + + + delete from green_carbon_data where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/GreenCarbonItemMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/GreenCarbonItemMapper.xml new file mode 100644 index 00000000..b4a42722 --- /dev/null +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/GreenCarbonItemMapper.xml @@ -0,0 +1,118 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select g.id, g.com_id, g.project_id, g.carbon_factor_type, g.carbon_name, g.unit, + g.carbon_factor, g.state, g.remark, g.is_del, g.create_by, g.create_time, g.update_by, g.update_time, + dp.`dept_name` comp_name,pi.`project_name` + from green_carbon_item g + LEFT JOIN sys_dept dp ON g.`com_id`=dp.`dept_id` + LEFT JOIN pro_project_info pi ON g.`project_id`=pi.`id` + + + + + + + + insert into green_carbon_item + + com_id, + project_id, + carbon_factor_type, + carbon_name, + unit, + carbon_factor, + state, + remark, + is_del, + create_by, + create_time, + update_by, + update_time, + + + #{comId}, + #{projectId}, + #{carbonFactorType}, + #{carbonName}, + #{unit}, + #{carbonFactor}, + #{state}, + #{remark}, + #{isDel}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + + + + + update green_carbon_item + + com_id = #{comId}, + project_id = #{projectId}, + carbon_factor_type = #{carbonFactorType}, + carbon_name = #{carbonName}, + unit = #{unit}, + carbon_factor = #{carbonFactor}, + state = #{state}, + remark = #{remark}, + is_del = #{isDel}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + + where id = #{id} + + + + delete from green_carbon_item where id = #{id} + + + + delete from green_carbon_item where id in + + #{id} + + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonDataController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonDataController.java new file mode 100644 index 00000000..9403c027 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonDataController.java @@ -0,0 +1,107 @@ +package com.yanzhu.manage.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import com.yanzhu.manage.domain.GreenCarbonData; +import com.yanzhu.manage.service.IGreenCarbonDataService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 建碳管理Controller + * + * @author yanzhu + * @date 2024-12-07 + */ +@RestController +@RequestMapping("/greenCarbonData") +public class GreenCarbonDataController extends BaseController +{ + @Autowired + private IGreenCarbonDataService greenCarbonDataService; + + /** + * 查询建碳管理列表 + */ + @RequiresPermissions("manage:greenCarbonData:list") + @GetMapping("/list") + public TableDataInfo list(GreenCarbonData greenCarbonData) + { + startPage(); + List list = greenCarbonDataService.selectGreenCarbonDataList(greenCarbonData); + return getDataTable(list); + } + + /** + * 导出建碳管理列表 + */ + @RequiresPermissions("manage:greenCarbonData:export") + @Log(title = "建碳管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, GreenCarbonData greenCarbonData) + { + List list = greenCarbonDataService.selectGreenCarbonDataList(greenCarbonData); + ExcelUtil util = new ExcelUtil(GreenCarbonData.class); + util.exportExcel(response, list, "建碳管理数据"); + } + + /** + * 获取建碳管理详细信息 + */ + @RequiresPermissions("manage:greenCarbonData:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(greenCarbonDataService.selectGreenCarbonDataById(id)); + } + + /** + * 新增建碳管理 + */ + @RequiresPermissions("manage:greenCarbonData:add") + @Log(title = "建碳管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody GreenCarbonData greenCarbonData) + { + return toAjax(greenCarbonDataService.insertGreenCarbonData(greenCarbonData)); + } + + /** + * 修改建碳管理 + */ + @RequiresPermissions("manage:greenCarbonData:edit") + @Log(title = "建碳管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody GreenCarbonData greenCarbonData) + { + return toAjax(greenCarbonDataService.updateGreenCarbonData(greenCarbonData)); + } + + /** + * 删除建碳管理 + */ + @RequiresPermissions("manage:greenCarbonData:remove") + @Log(title = "建碳管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(greenCarbonDataService.deleteGreenCarbonDataByIds(ids)); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java new file mode 100644 index 00000000..04ac91be --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/GreenCarbonItemController.java @@ -0,0 +1,194 @@ +package com.yanzhu.manage.controller; + +import java.io.*; +import java.nio.file.Files; +import java.util.List; + +import com.yanzhu.common.core.utils.poi.ExcelUtil; +import com.yanzhu.common.core.web.controller.BaseController; +import com.yanzhu.common.core.web.domain.AjaxResult; +import com.yanzhu.common.core.web.page.TableDataInfo; +import com.yanzhu.common.log.annotation.Log; +import com.yanzhu.common.log.enums.BusinessType; +import com.yanzhu.common.security.annotation.RequiresPermissions; +import com.yanzhu.manage.domain.GreenCarbonData; +import com.yanzhu.manage.domain.GreenCarbonItem; +import com.yanzhu.manage.service.IGreenCarbonDataService; +import com.yanzhu.manage.service.IGreenCarbonItemService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; + +import javax.servlet.http.HttpServletResponse; + +/** + * 碳因子管理Controller + * + * @author yanzhu + * @date 2024-12-07 + */ +@RestController +@RequestMapping("/greenCarbonItem") +public class GreenCarbonItemController extends BaseController +{ + @Autowired + private IGreenCarbonItemService greenCarbonItemService; + + /** + * 查询碳因子管理列表 + */ + @RequiresPermissions("manage:greenCarbonItem:list") + @GetMapping("/list") + public TableDataInfo list(GreenCarbonItem greenCarbonItem) + { + startPage(); + List list = greenCarbonItemService.selectGreenCarbonItemList(greenCarbonItem); + return getDataTable(list); + } + + /** + * 导出碳因子管理列表 + */ + @RequiresPermissions("manage:greenCarbonItem:export") + @Log(title = "碳因子管理", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, GreenCarbonItem greenCarbonItem) + { + List list = greenCarbonItemService.selectGreenCarbonItemList(greenCarbonItem); + for (GreenCarbonItem it : list){ + if(it.getCarbonFactorType().equals(1l)){ + it.setFactorType("建筑材料"); + } + if(it.getCarbonFactorType().equals(2l)){ + it.setFactorType("油料"); + } + if(it.getCarbonFactorType().equals(3l)){ + it.setFactorType("电"); + } + } + ExcelUtil util = new ExcelUtil(GreenCarbonItem.class); + util.exportExcel(response, list, "碳因子管理数据"); + } + + @RequiresPermissions("manage:greenCarbonItem:import") + @Log(title = "碳因子管理", businessType = BusinessType.IMPORT) + @PostMapping("/import") + public AjaxResult importData(HttpServletResponse response,MultipartFile file) throws Exception { + ExcelUtil util = new ExcelUtil(GreenCarbonItem.class); + List list= util.importExcel(file.getInputStream()); + GreenCarbonItem where=new GreenCarbonItem(); + List findList; + for (GreenCarbonItem item : list){ + if(item.getId()==null|| item.getId().equals(0l)){ + where.setComId(item.getComId()); + where.setProjectId(item.getProjectId()); + where.setCarbonName(item.getCarbonName()); + where.setCarbonFactorType(item.getCarbonFactorType()); + findList=greenCarbonItemService.selectGreenCarbonItemList(where); + if(findList.size()>0){ + item.setRemark("当前项目已存在相同数据!"); + } else{ + greenCarbonItemService.insertGreenCarbonItem(item); + item.setRemark("增加成功!"); + } + }else{ + GreenCarbonItem old=greenCarbonItemService.selectGreenCarbonItemById(item.getId()); + if(old==null){ + item.setRemark("无效ID"); + }else{ + where.setComId(item.getComId()); + where.setProjectId(item.getProjectId()); + where.setCarbonName(item.getCarbonName()); + where.setCarbonFactorType(item.getCarbonFactorType()); + findList = greenCarbonItemService.selectGreenCarbonItemList(where); + boolean isFind=false; + if(findList.size()>0){ + for(GreenCarbonItem it : findList){ + if(!it.getId().equals(item.getId())){ + isFind=true; + } + } + } + if(isFind){ + item.setRemark("当前项目已存在相同数据!"); + }else{ + greenCarbonItemService.updateGreenCarbonItem(item); + item.setRemark("修改成功!"); + } + } + } + } + return AjaxResult.success(list); + } + /** + * 获取碳因子管理详细信息 + */ + @RequiresPermissions("manage:greenCarbonItem:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(greenCarbonItemService.selectGreenCarbonItemById(id)); + } + + /** + * 新增碳因子管理 + */ + @RequiresPermissions("manage:greenCarbonItem:add") + @Log(title = "碳因子管理", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody GreenCarbonItem greenCarbonItem) + { + GreenCarbonItem where=new GreenCarbonItem(); + where.setComId(greenCarbonItem.getComId()); + where.setProjectId(greenCarbonItem.getProjectId()); + where.setCarbonName(greenCarbonItem.getCarbonName()); + where.setCarbonFactorType(greenCarbonItem.getCarbonFactorType()); + List list = greenCarbonItemService.selectGreenCarbonItemList(where); + if(list.size()>0){ + return AjaxResult.error("当前项目已存在相同数据!"); + } + return toAjax(greenCarbonItemService.insertGreenCarbonItem(greenCarbonItem)); + } + + /** + * 修改碳因子管理 + */ + @RequiresPermissions("manage:greenCarbonItem:edit") + @Log(title = "碳因子管理", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody GreenCarbonItem greenCarbonItem) + { + GreenCarbonItem where=new GreenCarbonItem(); + where.setComId(greenCarbonItem.getComId()); + where.setProjectId(greenCarbonItem.getProjectId()); + where.setCarbonName(greenCarbonItem.getCarbonName()); + where.setCarbonFactorType(greenCarbonItem.getCarbonFactorType()); + List list = greenCarbonItemService.selectGreenCarbonItemList(where); + if(list.size()>0){ + for(GreenCarbonItem it : list){ + if(!it.getId().equals(greenCarbonItem.getId())){ + return AjaxResult.error("当前项目已存在相同数据!"); + } + } + } + return toAjax(greenCarbonItemService.updateGreenCarbonItem(greenCarbonItem)); + } + + /** + * 删除碳因子管理 + */ + @RequiresPermissions("manage:greenCarbonItem:remove") + @Log(title = "碳因子管理", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(greenCarbonItemService.deleteGreenCarbonItemByIds(ids)); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IGreenCarbonDataService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IGreenCarbonDataService.java new file mode 100644 index 00000000..9aa8f4d3 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IGreenCarbonDataService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.GreenCarbonData; + +/** + * 建碳管理Service接口 + * + * @author yanzhu + * @date 2024-12-07 + */ +public interface IGreenCarbonDataService +{ + /** + * 查询建碳管理 + * + * @param id 建碳管理主键 + * @return 建碳管理 + */ + public GreenCarbonData selectGreenCarbonDataById(Long id); + + /** + * 查询建碳管理列表 + * + * @param greenCarbonData 建碳管理 + * @return 建碳管理集合 + */ + public List selectGreenCarbonDataList(GreenCarbonData greenCarbonData); + + /** + * 新增建碳管理 + * + * @param greenCarbonData 建碳管理 + * @return 结果 + */ + public int insertGreenCarbonData(GreenCarbonData greenCarbonData); + + /** + * 修改建碳管理 + * + * @param greenCarbonData 建碳管理 + * @return 结果 + */ + public int updateGreenCarbonData(GreenCarbonData greenCarbonData); + + /** + * 批量删除建碳管理 + * + * @param ids 需要删除的建碳管理主键集合 + * @return 结果 + */ + public int deleteGreenCarbonDataByIds(Long[] ids); + + /** + * 删除建碳管理信息 + * + * @param id 建碳管理主键 + * @return 结果 + */ + public int deleteGreenCarbonDataById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IGreenCarbonItemService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IGreenCarbonItemService.java new file mode 100644 index 00000000..74734289 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IGreenCarbonItemService.java @@ -0,0 +1,61 @@ +package com.yanzhu.manage.service; + +import java.util.List; +import com.yanzhu.manage.domain.GreenCarbonItem; + +/** + * 碳因子管理Service接口 + * + * @author yanzhu + * @date 2024-12-07 + */ +public interface IGreenCarbonItemService +{ + /** + * 查询碳因子管理 + * + * @param id 碳因子管理主键 + * @return 碳因子管理 + */ + public GreenCarbonItem selectGreenCarbonItemById(Long id); + + /** + * 查询碳因子管理列表 + * + * @param greenCarbonItem 碳因子管理 + * @return 碳因子管理集合 + */ + public List selectGreenCarbonItemList(GreenCarbonItem greenCarbonItem); + + /** + * 新增碳因子管理 + * + * @param greenCarbonItem 碳因子管理 + * @return 结果 + */ + public int insertGreenCarbonItem(GreenCarbonItem greenCarbonItem); + + /** + * 修改碳因子管理 + * + * @param greenCarbonItem 碳因子管理 + * @return 结果 + */ + public int updateGreenCarbonItem(GreenCarbonItem greenCarbonItem); + + /** + * 批量删除碳因子管理 + * + * @param ids 需要删除的碳因子管理主键集合 + * @return 结果 + */ + public int deleteGreenCarbonItemByIds(Long[] ids); + + /** + * 删除碳因子管理信息 + * + * @param id 碳因子管理主键 + * @return 结果 + */ + public int deleteGreenCarbonItemById(Long id); +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/GreenCarbonDataServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/GreenCarbonDataServiceImpl.java new file mode 100644 index 00000000..aa51ffcc --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/GreenCarbonDataServiceImpl.java @@ -0,0 +1,100 @@ +package com.yanzhu.manage.service.impl; + +import java.util.List; + +import com.yanzhu.common.core.context.SecurityContextHolder; +import com.yanzhu.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.manage.mapper.GreenCarbonDataMapper; +import com.yanzhu.manage.domain.GreenCarbonData; +import com.yanzhu.manage.service.IGreenCarbonDataService; + +/** + * 建碳管理Service业务层处理 + * + * @author yanzhu + * @date 2024-12-07 + */ +@Service +public class GreenCarbonDataServiceImpl implements IGreenCarbonDataService +{ + @Autowired + private GreenCarbonDataMapper greenCarbonDataMapper; + + /** + * 查询建碳管理 + * + * @param id 建碳管理主键 + * @return 建碳管理 + */ + @Override + public GreenCarbonData selectGreenCarbonDataById(Long id) + { + return greenCarbonDataMapper.selectGreenCarbonDataById(id); + } + + /** + * 查询建碳管理列表 + * + * @param greenCarbonData 建碳管理 + * @return 建碳管理 + */ + @Override + public List selectGreenCarbonDataList(GreenCarbonData greenCarbonData) + { + return greenCarbonDataMapper.selectGreenCarbonDataList(greenCarbonData); + } + + /** + * 新增建碳管理 + * + * @param greenCarbonData 建碳管理 + * @return 结果 + */ + @Override + public int insertGreenCarbonData(GreenCarbonData greenCarbonData) + { + greenCarbonData.setCreateBy(SecurityContextHolder.getUserName()); + greenCarbonData.setCreateTime(DateUtils.getNowDate()); + return greenCarbonDataMapper.insertGreenCarbonData(greenCarbonData); + } + + /** + * 修改建碳管理 + * + * @param greenCarbonData 建碳管理 + * @return 结果 + */ + @Override + public int updateGreenCarbonData(GreenCarbonData greenCarbonData) + { + greenCarbonData.setUpdateBy(SecurityContextHolder.getUserName()); + greenCarbonData.setUpdateTime(DateUtils.getNowDate()); + return greenCarbonDataMapper.updateGreenCarbonData(greenCarbonData); + } + + /** + * 批量删除建碳管理 + * + * @param ids 需要删除的建碳管理主键 + * @return 结果 + */ + @Override + public int deleteGreenCarbonDataByIds(Long[] ids) + { + return greenCarbonDataMapper.deleteGreenCarbonDataByIds(ids); + } + + /** + * 删除建碳管理信息 + * + * @param id 建碳管理主键 + * @return 结果 + */ + @Override + public int deleteGreenCarbonDataById(Long id) + { + return greenCarbonDataMapper.deleteGreenCarbonDataById(id); + } +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/GreenCarbonItemServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/GreenCarbonItemServiceImpl.java new file mode 100644 index 00000000..5be9d261 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/GreenCarbonItemServiceImpl.java @@ -0,0 +1,100 @@ +package com.yanzhu.manage.service.impl; + +import java.util.List; + +import com.yanzhu.common.core.context.SecurityContextHolder; +import com.yanzhu.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.yanzhu.manage.mapper.GreenCarbonItemMapper; +import com.yanzhu.manage.domain.GreenCarbonItem; +import com.yanzhu.manage.service.IGreenCarbonItemService; + +/** + * 碳因子管理Service业务层处理 + * + * @author yanzhu + * @date 2024-12-07 + */ +@Service +public class GreenCarbonItemServiceImpl implements IGreenCarbonItemService +{ + @Autowired + private GreenCarbonItemMapper greenCarbonItemMapper; + + /** + * 查询碳因子管理 + * + * @param id 碳因子管理主键 + * @return 碳因子管理 + */ + @Override + public GreenCarbonItem selectGreenCarbonItemById(Long id) + { + return greenCarbonItemMapper.selectGreenCarbonItemById(id); + } + + /** + * 查询碳因子管理列表 + * + * @param greenCarbonItem 碳因子管理 + * @return 碳因子管理 + */ + @Override + public List selectGreenCarbonItemList(GreenCarbonItem greenCarbonItem) + { + return greenCarbonItemMapper.selectGreenCarbonItemList(greenCarbonItem); + } + + /** + * 新增碳因子管理 + * + * @param greenCarbonItem 碳因子管理 + * @return 结果 + */ + @Override + public int insertGreenCarbonItem(GreenCarbonItem greenCarbonItem) + { + greenCarbonItem.setCreateBy(SecurityContextHolder.getUserName()); + greenCarbonItem.setCreateTime(DateUtils.getNowDate()); + return greenCarbonItemMapper.insertGreenCarbonItem(greenCarbonItem); + } + + /** + * 修改碳因子管理 + * + * @param greenCarbonItem 碳因子管理 + * @return 结果 + */ + @Override + public int updateGreenCarbonItem(GreenCarbonItem greenCarbonItem) + { + greenCarbonItem.setUpdateBy(SecurityContextHolder.getUserName()); + greenCarbonItem.setUpdateTime(DateUtils.getNowDate()); + return greenCarbonItemMapper.updateGreenCarbonItem(greenCarbonItem); + } + + /** + * 批量删除碳因子管理 + * + * @param ids 需要删除的碳因子管理主键 + * @return 结果 + */ + @Override + public int deleteGreenCarbonItemByIds(Long[] ids) + { + return greenCarbonItemMapper.deleteGreenCarbonItemByIds(ids); + } + + /** + * 删除碳因子管理信息 + * + * @param id 碳因子管理主键 + * @return 结果 + */ + @Override + public int deleteGreenCarbonItemById(Long id) + { + return greenCarbonItemMapper.deleteGreenCarbonItemById(id); + } +} diff --git a/yanzhu-ui-vue3/src/api/manage/greenCarbonData.js b/yanzhu-ui-vue3/src/api/manage/greenCarbonData.js new file mode 100644 index 00000000..03374e4c --- /dev/null +++ b/yanzhu-ui-vue3/src/api/manage/greenCarbonData.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询建碳管理列表 +export function listGreenCarbonData(query) { + return request({ + url: '/manage/greenCarbonData/list', + method: 'get', + params: query + }) +} + +// 查询建碳管理详细 +export function getGreenCarbonData(id) { + return request({ + url: '/manage/greenCarbonData/' + id, + method: 'get' + }) +} + +// 新增建碳管理 +export function addGreenCarbonData(data) { + return request({ + url: '/manage/greenCarbonData', + method: 'post', + data: data + }) +} + +// 修改建碳管理 +export function updateGreenCarbonData(data) { + return request({ + url: '/manage/greenCarbonData', + method: 'put', + data: data + }) +} + +// 删除建碳管理 +export function delGreenCarbonData(id) { + return request({ + url: '/manage/greenCarbonData/' + id, + method: 'delete' + }) +} diff --git a/yanzhu-ui-vue3/src/api/manage/greenCarbonItem.js b/yanzhu-ui-vue3/src/api/manage/greenCarbonItem.js new file mode 100644 index 00000000..e16916e1 --- /dev/null +++ b/yanzhu-ui-vue3/src/api/manage/greenCarbonItem.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询碳因子管理列表 +export function listGreenCarbonItem(query) { + return request({ + url: '/manage/greenCarbonItem/list', + method: 'get', + params: query + }) +} + +// 查询碳因子管理详细 +export function getGreenCarbonItem(id) { + return request({ + url: '/manage/greenCarbonItem/' + id, + method: 'get' + }) +} + +// 新增碳因子管理 +export function addGreenCarbonItem(data) { + return request({ + url: '/manage/greenCarbonItem', + method: 'post', + data: data + }) +} + +// 修改碳因子管理 +export function updateGreenCarbonItem(data) { + return request({ + url: '/manage/greenCarbonItem', + method: 'put', + data: data + }) +} + +// 删除碳因子管理 +export function delGreenCarbonItem(id) { + return request({ + url: '/manage/greenCarbonItem/' + id, + method: 'delete' + }) +} diff --git a/yanzhu-ui-vue3/src/assets/styles/index.scss b/yanzhu-ui-vue3/src/assets/styles/index.scss index 2b8dca52..ca6abaa2 100644 --- a/yanzhu-ui-vue3/src/assets/styles/index.scss +++ b/yanzhu-ui-vue3/src/assets/styles/index.scss @@ -182,3 +182,10 @@ aside { margin-bottom: 10px; } } + +.fgreen{ + color: green; +} +.fred{ + color: red; +} \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/layout/components/Navbar.vue b/yanzhu-ui-vue3/src/layout/components/Navbar.vue index 47edcf94..7073da16 100644 --- a/yanzhu-ui-vue3/src/layout/components/Navbar.vue +++ b/yanzhu-ui-vue3/src/layout/components/Navbar.vue @@ -82,7 +82,7 @@ function logout() { type: 'warning' }).then(() => { userStore.logOut().then(() => { - location.href = '/index'; + location.href = '#/index'; }) }).catch(() => { }); } diff --git a/yanzhu-ui-vue3/src/permission.js b/yanzhu-ui-vue3/src/permission.js index a474e0e6..13f1261a 100644 --- a/yanzhu-ui-vue3/src/permission.js +++ b/yanzhu-ui-vue3/src/permission.js @@ -52,7 +52,7 @@ router.beforeEach((to, from, next) => { // 在免登录白名单，直接进入 next() } else { - next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页 + next(`/login?redirect=${(to.fullPath[0]=='/'?"#":"")+to.fullPath}`) // 否则全部重定向到登录页 NProgress.done() } } diff --git a/yanzhu-ui-vue3/src/views/manage/greenCarbonData/index.vue b/yanzhu-ui-vue3/src/views/manage/greenCarbonData/index.vue new file mode 100644 index 00000000..24f7ad1f --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/greenCarbonData/index.vue @@ -0,0 +1,320 @@ + + + diff --git a/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/greenCarbonData.js b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/greenCarbonData.js new file mode 100644 index 00000000..62b37c39 --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/greenCarbonData.js @@ -0,0 +1,15 @@ +const types=[ + {value:1,text:'建筑材料'}, + {value:2,text:'油料'}, + {value:3,text:'电'} +] + +export function getGreenCarbon(id){ + let tmps=types.filter(d=>d.value==id); + return tmps.length>0?tmps[0]:{}; +} + + +export default { + types +} \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue new file mode 100644 index 00000000..5ae1966d --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/greenCarbonItem/index.vue @@ -0,0 +1,368 @@ + + + + \ No newline at end of file