新增接口

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/controller/admin/base/TraceabilityBaseController.java

@@ -125,4 +125,8 @@ public class TraceabilityBaseController {
         Map<String,Object> map = baseService.getAllBaseInfo(id);
         return success(map);
     }
+    @GetMapping("getCompanyBase")
+    public CommonResult<Map<String,Object>> getCompanyBase(@RequestParam("id") Long id) throws IllegalAccessException {
+        return success(baseService.getCompanyBase(id));
+    }
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseService.java

@@ -75,4 +75,6 @@ public interface TraceabilityBaseService {
     boolean selectIsBindBlock(Integer id);
 
     TraceabilityBaseDO selectById(Long id);
+
+    Map<String, Object> getCompanyBase(Long id) throws IllegalAccessException;
 }

cjy-module-traceability/cjy-module-traceability-biz/src/main/java/com/cjy/traceability/module/traceability/service/base/TraceabilityBaseServiceImpl.java

@@ -9,12 +9,15 @@ import com.cjy.traceability.framework.ip.core.utils.AreaUtils;
 import com.cjy.traceability.module.traceability.controller.admin.base.vo.TraceabilityBasePageReqVO;
 import com.cjy.traceability.module.traceability.controller.admin.base.vo.TraceabilityBaseSaveReqVO;
 import com.cjy.traceability.module.traceability.dal.dataobject.base.TraceabilityBaseDO;
+import com.cjy.traceability.module.traceability.dal.dataobject.company.CompanyDO;
 import com.cjy.traceability.module.traceability.dal.mysql.base.TraceabilityBaseMapper;
 import com.cjy.traceability.module.traceability.dal.mysql.block.BlockMapper;
+import com.cjy.traceability.module.traceability.dal.mysql.company.CompanyMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
+import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -34,6 +37,8 @@ public class TraceabilityBaseServiceImpl implements TraceabilityBaseService {
 	@Resource
 	private TraceabilityBaseMapper baseMapper;
 	@Resource
+	private CompanyMapper companyMapper;
+	@Resource
 	private BlockMapper blockMapper;
 	@Override
 	public Integer createBase(TraceabilityBaseSaveReqVO createReqVO) {
@@ -143,4 +148,25 @@ public class TraceabilityBaseServiceImpl implements TraceabilityBaseService {
 	public TraceabilityBaseDO selectById(Long id) {
 		return  baseMapper.selectById(id);
 	}
+
+	@Override
+	public Map<String, Object> getCompanyBase(Long id) throws IllegalAccessException {
+		TraceabilityBaseDO traceabilityBaseDO = baseMapper.selectById(id);
+		Map<String, Object> result = new HashMap<>();
+		Class<?> clazz = traceabilityBaseDO.getClass();
+		for (Field field : clazz.getDeclaredFields()) {
+			field.setAccessible(true); // 设置为可访问，以便访问私有字段
+			result.put(field.getName(), field.get(traceabilityBaseDO));
+		}
+		Area provinceArea = AreaUtils.getArea(Integer.parseInt(traceabilityBaseDO.getProvince() == null ? "-1" : traceabilityBaseDO.getProvince()));
+		Area cityArea = AreaUtils.getArea(Integer.parseInt(traceabilityBaseDO.getCity() == null ? "-1" : traceabilityBaseDO.getCity()));
+		Area districtArea = AreaUtils.getArea(Integer.parseInt(traceabilityBaseDO.getDistrict() == null ? "-1" : traceabilityBaseDO.getDistrict()));
+		result.put("province", provinceArea == null ? "" : provinceArea.getName());
+		result.put("city",cityArea == null?"" : cityArea.getName());
+		result.put("district",districtArea == null ? "" : districtArea.getName());
+		 // 查询企业信息
+		CompanyDO companyDO = 	companyMapper.selectById(traceabilityBaseDO.getCompanyId());
+		result.put("companyName",companyDO.getCompanyName());
+		return result;
+	}
 }