修改代码

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java

@@ -5,7 +5,6 @@ import java.util.*;
 import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.BeanUtils;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.patrol.business.dao.repository.IPointClassifyDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IPointInputItemDao;
@@ -13,10 +12,11 @@ import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointDao;
 import com.yeejoin.amos.patrol.business.dao.repository.IRoutePointItemDao;
 import com.yeejoin.amos.patrol.business.feign.EquipFeign;
 import com.yeejoin.amos.patrol.business.feign.JcsFeignClient;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemNewVo;
+import com.yeejoin.amos.patrol.business.vo.*;
 import com.yeejoin.amos.patrol.dao.entity.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
@@ -52,9 +52,6 @@ import com.yeejoin.amos.patrol.business.util.CommonResponseUtil;
 import com.yeejoin.amos.patrol.business.util.DaoCriteria;
 import com.yeejoin.amos.patrol.business.util.FileHelper;
 import com.yeejoin.amos.patrol.business.util.PointParamUtils;
-import com.yeejoin.amos.patrol.business.vo.PointClassifyVo;
-import com.yeejoin.amos.patrol.business.vo.PointInputItemVo;
-import com.yeejoin.amos.patrol.business.vo.PointVo;
 import com.yeejoin.amos.patrol.core.async.AsyncTask;
 import com.yeejoin.amos.patrol.core.common.request.CommonPageable;
 import com.yeejoin.amos.patrol.core.common.request.CommonRequest;
@@ -400,7 +397,11 @@ public class PointController extends AbstractBaseController {
 	public CommonResponse queryPointByIdNew(@ApiParam(value = "巡检点id", required = true) @RequestParam String id) {
 		try {
 			Point point = iPointService.queryPointById(Long.valueOf(id));
-			return CommonResponseUtil.success(point);
+			PointNewVo pointNewVo = new PointNewVo();
+			BeanUtils.copyProperties(point,pointNewVo);
+			pointNewVo.setIsIndoor(point.getIsIndoor() == false ? "0":"1");
+			pointNewVo.setOffline(point.getOffline() == false ? "0":"1");
+			return CommonResponseUtil.success(pointNewVo);
 		} catch (Exception e) {
 			log.error(e.getMessage(), e);
 			return CommonResponseUtil.failure("查询巡检点失败");
@@ -1340,12 +1341,18 @@ public class PointController extends AbstractBaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "新增巡检点", notes = "新增巡检点")
 	@PostMapping(value = "/addPointNew", produces = "application/json;charset=UTF-8")
-	public CommonResponse AddPointNew(@ApiParam(value = "巡检点", required = true) @RequestBody Point point){
+	public CommonResponse AddPointNew(@ApiParam(value = "巡检点", required = true) @RequestBody PointNewVo pointNewVo){
 		AgencyUserModel user = getUserInfo();
 		if (ObjectUtils.isEmpty(user)) {
 			return CommonResponseUtil.failure("用户session过期");
 		}
 		try {
+			Point point = new Point();
+			BeanUtils.copyProperties(pointNewVo,point);
+
+			point.setIsIndoor(pointNewVo.getIsIndoor().equals("1") ? true : false);
+			point.setOffline(pointNewVo.getOffline().equals("1") ? true : false);
+
 			ReginParams reginParams = getSelectedOrgInfo();
 			String loginOrgCode = getOrgCode(reginParams);
 			point.setOrgCode(loginOrgCode);	//点归属于公司