diff --git a/src/main/java/cn/palmte/work/controller/backend/ProfitMarginConfigController.java b/src/main/java/cn/palmte/work/controller/backend/ProfitMarginConfigController.java deleted file mode 100644 index b12f2d7..0000000 --- a/src/main/java/cn/palmte/work/controller/backend/ProfitMarginConfigController.java +++ /dev/null @@ -1,44 +0,0 @@ -package cn.palmte.work.controller.backend; - -import cn.palmte.work.model.ProfitMarginConfig; -import cn.palmte.work.model.ProfitMarginConfigRepository; -import cn.palmte.work.service.ProfitMarginConfigService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.util.Map; - -@Controller -@RequestMapping("/profitMarginConfig") -public class ProfitMarginConfigController extends BaseController{ - - @Autowired - private ProfitMarginConfigService profitMarginConfigService; - - @Autowired - private ProfitMarginConfigRepository profitMarginConfigRepository; - - /** - * 跳转到编辑页面 - */ - @RequestMapping("/edit") - public String edit(Map model) { - ProfitMarginConfig profitMarginConfig = profitMarginConfigRepository.findOne(1); - model.put("profitMarginConfig", profitMarginConfig); - return "/admin/profit_marfin_config_input"; - } - - @PostMapping(value = "/save") - public String save(ProfitMarginConfig profitMarginConfig,Map model){ - try { - profitMarginConfigService.saveOrUpdate(profitMarginConfig); - } catch (Exception e) { - model.put("errorMessage", e.getMessage()); - return "/common/error"; - } - return "redirect:/profitMarginConfig/edit"; - } -} diff --git a/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java b/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java new file mode 100644 index 0000000..52dd942 --- /dev/null +++ b/src/main/java/cn/palmte/work/controller/backend/SysConfigController.java @@ -0,0 +1,36 @@ +package cn.palmte.work.controller.backend; + +import cn.palmte.work.model.SysConfigRepository; +import cn.palmte.work.pojo.SysConfigRequest; +import cn.palmte.work.service.SysConfigService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.Map; + + +@Controller +@RequestMapping("/sys/config") +public class SysConfigController extends BaseController{ + + @Autowired + private SysConfigService sysConfigService; + + @Autowired + private SysConfigRepository sysConfigRepository; + + @RequestMapping("/edit") + public String edit(Map model) { + model.put("underwrittenTaxRate",sysConfigRepository.findByCodeEquals("underwrittenTaxRate").getValue()); + model.put("projectContributionProfitRateThreshold",sysConfigRepository.findByCodeEquals("projectContributionProfitRateThreshold").getValue()); + return "admin/profit_marfin_config_input"; + } + + @RequestMapping("/save") + public String save(SysConfigRequest sysConfigRequest, Map model) { + sysConfigService.saveOrUpdate(sysConfigRequest); + return "redirect:/sys/config/edit"; + } + +} diff --git a/src/main/java/cn/palmte/work/model/ProfitMarginConfig.java b/src/main/java/cn/palmte/work/model/ProfitMarginConfig.java deleted file mode 100644 index ec8f6e3..0000000 --- a/src/main/java/cn/palmte/work/model/ProfitMarginConfig.java +++ /dev/null @@ -1,51 +0,0 @@ -package cn.palmte.work.model; - -import org.hibernate.annotations.GenericGenerator; - -import javax.persistence.*; - -/** - * 利润率配置 - */ -@Entity -@Table(name = "profit_margin_config") -public class ProfitMarginConfig { - - /** - * id - */ - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @GenericGenerator(name = "persistenceGenerator", strategy = "increment") - private Integer id; - - @Column(name = "year_profit_margin") - private String yearProfitMargin; - - @Column(name = "threshold_value") - private String thresholdValue; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getYearProfitMargin() { - return yearProfitMargin; - } - - public void setYearProfitMargin(String yearProfitMargin) { - this.yearProfitMargin = yearProfitMargin; - } - - public String getThresholdValue() { - return thresholdValue; - } - - public void setThresholdValue(String thresholdValue) { - this.thresholdValue = thresholdValue; - } -} \ No newline at end of file diff --git a/src/main/java/cn/palmte/work/model/ProfitMarginConfigRepository.java b/src/main/java/cn/palmte/work/model/ProfitMarginConfigRepository.java deleted file mode 100644 index cb97941..0000000 --- a/src/main/java/cn/palmte/work/model/ProfitMarginConfigRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package cn.palmte.work.model; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ProfitMarginConfigRepository extends JpaRepository { - -} diff --git a/src/main/java/cn/palmte/work/model/SysConfig.java b/src/main/java/cn/palmte/work/model/SysConfig.java new file mode 100644 index 0000000..8190cd7 --- /dev/null +++ b/src/main/java/cn/palmte/work/model/SysConfig.java @@ -0,0 +1,75 @@ +package cn.palmte.work.model; + +import org.hibernate.annotations.GenericGenerator; + +import javax.persistence.*; +import java.util.Date; + +/** + * 配置 + */ +@Entity +@Table(name = "sys_config") +public class SysConfig { + + /** + * id + */ + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @GenericGenerator(name = "persistenceGenerator", strategy = "increment") + private Integer id; + + private String code; + + private String name; + + private String value; + + /** + * 创建时间 + */ + @Column(name = "update_time") + @Temporal(TemporalType.TIMESTAMP) + private Date updateTime; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getValue() { + return value; + } + + public void setValue(String value) { + this.value = value; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } +} \ No newline at end of file diff --git a/src/main/java/cn/palmte/work/model/SysConfigRepository.java b/src/main/java/cn/palmte/work/model/SysConfigRepository.java new file mode 100644 index 0000000..02bedd0 --- /dev/null +++ b/src/main/java/cn/palmte/work/model/SysConfigRepository.java @@ -0,0 +1,9 @@ +package cn.palmte.work.model; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface SysConfigRepository extends JpaRepository { + + SysConfig findByCodeEquals(String code); + +} diff --git a/src/main/java/cn/palmte/work/pojo/SysConfigRequest.java b/src/main/java/cn/palmte/work/pojo/SysConfigRequest.java new file mode 100644 index 0000000..501eaec --- /dev/null +++ b/src/main/java/cn/palmte/work/pojo/SysConfigRequest.java @@ -0,0 +1,31 @@ +package cn.palmte.work.pojo; + +public class SysConfigRequest { + + /** + * 项目年利润率(资金利率) + */ + private String underwrittenTaxRate; + + /** + * 项目贡献利润率阀值 + */ + private String projectContributionProfitRateThreshold; + + + public String getUnderwrittenTaxRate() { + return underwrittenTaxRate; + } + + public void setUnderwrittenTaxRate(String underwrittenTaxRate) { + this.underwrittenTaxRate = underwrittenTaxRate; + } + + public String getProjectContributionProfitRateThreshold() { + return projectContributionProfitRateThreshold; + } + + public void setProjectContributionProfitRateThreshold(String projectContributionProfitRateThreshold) { + this.projectContributionProfitRateThreshold = projectContributionProfitRateThreshold; + } +} diff --git a/src/main/java/cn/palmte/work/service/ProfitMarginConfigService.java b/src/main/java/cn/palmte/work/service/ProfitMarginConfigService.java deleted file mode 100644 index 20ebf42..0000000 --- a/src/main/java/cn/palmte/work/service/ProfitMarginConfigService.java +++ /dev/null @@ -1,21 +0,0 @@ -package cn.palmte.work.service; - -import cn.palmte.work.model.ProfitMarginConfig; -import cn.palmte.work.model.ProfitMarginConfigRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service -public class ProfitMarginConfigService { - - @Autowired - private ProfitMarginConfigRepository profitMarginConfigRepository; - - - public void saveOrUpdate(ProfitMarginConfig profitMarginConfig) { - ProfitMarginConfig obj = profitMarginConfigRepository.findOne(1); - obj.setThresholdValue(profitMarginConfig.getThresholdValue()); - obj.setYearProfitMargin(profitMarginConfig.getYearProfitMargin()); - profitMarginConfigRepository.saveAndFlush(obj); - } -} diff --git a/src/main/java/cn/palmte/work/service/SysConfigService.java b/src/main/java/cn/palmte/work/service/SysConfigService.java new file mode 100644 index 0000000..a049674 --- /dev/null +++ b/src/main/java/cn/palmte/work/service/SysConfigService.java @@ -0,0 +1,26 @@ +package cn.palmte.work.service; + +import cn.palmte.work.model.SysConfig; +import cn.palmte.work.model.SysConfigRepository; +import cn.palmte.work.pojo.SysConfigRequest; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class SysConfigService { + + @Autowired + private SysConfigRepository sysConfigRepository; + + + public void saveOrUpdate(SysConfigRequest sysConfigRequest) { + SysConfig underwrittenTaxRate = sysConfigRepository.findByCodeEquals("underwrittenTaxRate"); + underwrittenTaxRate.setValue(sysConfigRequest.getUnderwrittenTaxRate()); + sysConfigRepository.saveAndFlush(underwrittenTaxRate); + + SysConfig projectContributionProfitRateThreshold = sysConfigRepository.findByCodeEquals("projectContributionProfitRateThreshold"); + projectContributionProfitRateThreshold.setValue(sysConfigRequest.getProjectContributionProfitRateThreshold()); + sysConfigRepository.saveAndFlush(projectContributionProfitRateThreshold); + + } +} diff --git a/src/main/resources/templates/admin/profit_marfin_config_input.ftl b/src/main/resources/templates/admin/profit_marfin_config_input.ftl index d36d5f6..d783e43 100644 --- a/src/main/resources/templates/admin/profit_marfin_config_input.ftl +++ b/src/main/resources/templates/admin/profit_marfin_config_input.ftl @@ -9,7 +9,7 @@
配置管理 /项目利润率配置
-
+
    @@ -28,10 +28,10 @@ 项目贡献利润率阀值:
-

注:请注意保留小数点后两位

@@ -45,10 +45,10 @@ 项目年利润率:
-

注:请注意保留小数点后两位