;

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/config/ContractConfiguration.java

@@ -24,6 +24,7 @@ import com.xyst.dinas.contract.service.ContractWarnService;
 import com.xyst.dinas.contract.task.ContractExpireCheckTask;
 import com.xyst.dinas.contract.task.ContractExpireCheckTaskRegister;
 import com.xyst.dinas.contract.web.ContractController;
+import com.xyst.dinas.contract.web.ContractWarnController;
 /**
  * 开启自动配置,无需手动注册Bean
  *
@@ -55,6 +56,11 @@ public class ContractConfiguration {
 		return new ContractWarnServiceImpl();
 	}
 	
+	@Bean
+	public ContractWarnController contractWarnController() {
+		return new ContractWarnController();
+	}
+	
 	
 	
 	

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/ContractController.java

@@ -22,11 +22,6 @@ import com.beecode.bcp.type.KClass;
 import com.beecode.bcp.type.KObject;
 import com.beecode.bcp.type.json.JSONObjectUtils;
 import com.beecode.inz.basis.team.pojo.ResponseObj;
-import com.beecode.xlib.runtime.Assert;
-import com.xyst.dinas.biz.request.UpdateWarnSetting;
-import com.xyst.dinas.biz.warn.BaseBusinessWarn;
-import com.xyst.dinas.biz.warn.WarnSetting;
-import com.xyst.dinas.biz.warn.service.IWarningSettingService;
 import com.xyst.dinas.contract.constant.ContractConstant;
 import com.xyst.dinas.contract.entity.BaseEntity;
 import com.xyst.dinas.contract.entity.CommonResult;
@@ -35,7 +30,6 @@ import com.xyst.dinas.contract.internal.dao.ContractInfoDao;
 import com.xyst.dinas.contract.request.ContractStatisticsQuery;
 import com.xyst.dinas.contract.request.ProjectListQuery;
 import com.xyst.dinas.contract.service.ContractService;
-import com.xyst.dinas.contract.warn.DinasCountWarningCalculate;
 
 @RestController
 public class ContractController {
@@ -145,65 +139,6 @@ public class ContractController {
 		return statisticsQuery.toString();
 	}
 
-	@Autowired
-	private IWarningSettingService warningSettingService;
-
-	@PostMapping("/contract/warn/fire")
-	public void warnFire() {
-		
-		// 合同审批通过后,自动新增砂石余量预警设置
-		String billType = "合同";
-		UUID contractId = UUID.fromString("b399f4a5-e446-439c-9601-177aad94b675");
-		String target = "细砂2";
-		int count = 100;// 某种砂石余量
-
-		BaseBusinessWarn contractBusinessWarn = new BaseBusinessWarn(billType, contractId, target);
-		DinasCountWarningCalculate dinasCountWarningCalculate = new DinasCountWarningCalculate(count);
-		contractBusinessWarn.setWarningCalculate(dinasCountWarningCalculate);
-		contractBusinessWarn.warn();
-	}
-	
-	//查询一条预警设置
-	@GetMapping("/contract/warnsetting/{id}")
-	public Object queryWarnSetting(@PathVariable UUID id) {
-		Assert.notNull(id,"The id must not be null");
-		return contractService.queryWarnSettingById(id);
-	}
-	
-	
-	//更新预警设置
-	@PostMapping("/warnsetting/update")// /contract
-	public ResponseObj updateWarnSettingPerson(@RequestBody UpdateWarnSetting updateWarnSetting) {
-		
-		UUID settingId = updateWarnSetting.getId();
-		BaseBusinessWarn contractBusinessWarn = new BaseBusinessWarn(settingId);
-		WarnSetting warnSetting = contractBusinessWarn.getWarnSetting();
-		String minOld = warnSetting.getMin()!=null?warnSetting.getMin():"";
-		String min = updateWarnSetting.getMin()!=null?updateWarnSetting.getMin():"";
-		
-		warningSettingService.updateWarnSetting(updateWarnSetting);
-		
-		if (minOld.equals(min)) {
-			return ResponseObj.success("预警设置更新成功");
-		}
-		int count = 100;	//查询合同中该砂石的余量
-		DinasCountWarningCalculate dinasCountWarningCalculate = new DinasCountWarningCalculate(count);
-		contractBusinessWarn.setWarningCalculate(dinasCountWarningCalculate);
-		contractBusinessWarn.warn();
-		
-		return ResponseObj.success("预警设置更新成功");
-	}
-	/**  
-	 * @Description: 根据合同查询预警设置中所有人员
-	 * @param id
-	 * @return return_type
-	 * @throws   
-	 */
-	@GetMapping("/contract/queryWarnSettingStaffByContractId/{contractId}")
-	public Object queryWarnSettingStaffByContractId(@PathVariable String contractId) {
-		Assert.notNull(contractId,"The contractId must not be null");
-		return contractService.queryWarnSettingStaffByContractId(contractId);
-	}
 	/**
 	 * 查询某区域公司下执行中的合同(指定时间范围内有效的)
 	 * @param regionCompanyId

backend/xyst.dinas.contract/src/main/java/com/xyst/dinas/contract/web/ContractWarnController.java

+package com.xyst.dinas.contract.web;
+
+import java.util.UUID;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.beecode.inz.basis.team.pojo.ResponseObj;
+import com.beecode.xlib.runtime.Assert;
+import com.xyst.dinas.biz.request.UpdateWarnSetting;
+import com.xyst.dinas.biz.warn.BaseBusinessWarn;
+import com.xyst.dinas.biz.warn.WarnSetting;
+import com.xyst.dinas.biz.warn.service.IWarningSettingService;
+import com.xyst.dinas.contract.service.ContractService;
+import com.xyst.dinas.contract.warn.DinasCountWarningCalculate;
+
+@RestController
+public class ContractWarnController {
+
+//	private final Logger logger = LoggerFactory.getLogger(this.getClass());
+
+	@Autowired
+	private ContractService contractService;
+
+
+	@Autowired
+	private IWarningSettingService warningSettingService;
+
+	@PostMapping("/contract/warn/fire")
+	public void warnFire() {
+		
+		// 合同审批通过后,自动新增砂石余量预警设置
+		String billType = "合同";
+		UUID contractId = UUID.fromString("b399f4a5-e446-439c-9601-177aad94b675");
+		String target = "细砂2";
+		int count = 100;// 某种砂石余量
+
+		BaseBusinessWarn contractBusinessWarn = new BaseBusinessWarn(billType, contractId, target);
+		DinasCountWarningCalculate dinasCountWarningCalculate = new DinasCountWarningCalculate(count);
+		contractBusinessWarn.setWarningCalculate(dinasCountWarningCalculate);
+		contractBusinessWarn.warn();
+	}
+	
+	//查询一条预警设置
+	@GetMapping("/contract/warnsetting/{id}")
+	public Object queryWarnSetting(@PathVariable UUID id) {
+		Assert.notNull(id,"The id must not be null");
+		return contractService.queryWarnSettingById(id);
+	}
+	
+	
+	//更新预警设置
+	@PostMapping("/warnsetting/update")// /contract
+	public Object updateWarnSettingPerson(@RequestBody UpdateWarnSetting updateWarnSetting) {
+		
+		UUID settingId = updateWarnSetting.getId();
+		BaseBusinessWarn contractBusinessWarn = new BaseBusinessWarn(settingId);
+		WarnSetting warnSetting = contractBusinessWarn.getWarnSetting();
+		String minOld = warnSetting.getMin()!=null?warnSetting.getMin():"";
+		String min = updateWarnSetting.getMin()!=null?updateWarnSetting.getMin():"";
+		
+		warningSettingService.updateWarnSetting(updateWarnSetting);
+		
+		if (minOld.equals(min)) {
+			return ResponseObj.success("预警设置更新成功");
+		}
+		int count = 100;	//查询合同中该砂石的余量
+		DinasCountWarningCalculate dinasCountWarningCalculate = new DinasCountWarningCalculate(count);
+		contractBusinessWarn.setWarningCalculate(dinasCountWarningCalculate);
+		contractBusinessWarn.warn();
+		
+		return ResponseObj.success("预警设置更新成功");
+	}
+	/**  
+	 * @Description: 根据合同查询预警设置中所有人员
+	 * @param id
+	 * @return return_type
+	 * @throws   
+	 */
+	@GetMapping("/contract/queryWarnSettingStaffByContractId/{contractId}")
+	public Object queryWarnSettingStaffByContractId(@PathVariable String contractId) {
+		Assert.notNull(contractId,"The contractId must not be null");
+		return contractService.queryWarnSettingStaffByContractId(contractId);
+	}
+
+	
+}
\ No newline at end of file