Merge branch 'dev-2.11.0' of depot-qinghai/depot-device-qinghai into dev

src/main/java/com/chinaitop/depot/device/controller/BusinessImAssetController.java

@@ -1,6 +1,5 @@
 package com.chinaitop.depot.device.controller;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -9,6 +8,7 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
@@ -32,7 +32,7 @@ import io.swagger.annotations.ApiOperation;
  */
 
 @RestController
-@RequestMapping(value= {"/businessImAsset"})
+@RequestMapping(value= "/businessImAsset")
 @Api(value= "BusinessImAssetController", description = "资产管理")
 public class BusinessImAssetController {
 
@@ -101,18 +101,15 @@ public class BusinessImAssetController {
      */
 	 @RequestMapping(value="/save",produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.POST)
 	 @ApiOperation(value="保存数据", notes = "保存")
-	 @ApiImplicitParams({
-	    	@ApiImplicitParam(name="businessImAssetJson", value="表数据", paramType="form")
-	 })
-    public Map<String, Object> save(String businessImAssetJson) {
+	
+    public Map<String, Object> save(@RequestBody BusinessImAsset businessImAsset) {
         Map<String, Object> modelMap = new HashMap<>();
         // JSON字符串转对象
         ObjectMapper mapper = new ObjectMapper();
         try {
-        	BusinessImAsset businessImAsset = (BusinessImAsset)mapper.readValue(businessImAssetJson, BusinessImAsset.class);
         	businessImAssetService.save(businessImAsset);
             modelMap.put("status", "success");
-        } catch (IOException e) {
+        } catch (Exception e) {
             modelMap.put("status", "error");
             modelMap.put("msg", "保存失败！");
             e.printStackTrace();
@@ -137,5 +134,18 @@ public class BusinessImAssetController {
        return new BusinessImAsset();
     }
    
-    
+	 
+	 /**
+	  * 资产编号获取
+	  */
+	@RequestMapping(value ="/getAssetCode", produces = MediaType.APPLICATION_JSON_VALUE, method=RequestMethod.GET)
+	@ApiOperation(value="资产编号获取", notes = "资产编号获取")
+	@ApiImplicitParams({
+			@ApiImplicitParam(name = "orgId", value = "单位id", paramType = "query")
+	})
+    public String getAssetCode(Integer orgId){
+		
+	   return businessImAssetService.getAssetCode(orgId);
+    }
+	
 }

src/main/java/com/chinaitop/depot/device/service/BusinessImAssetService.java

@@ -16,4 +16,6 @@ public interface BusinessImAssetService {
 
 	BusinessImAsset loadDataById(int id);
 
+	String getAssetCode(Integer orgId);
+
 }

src/main/java/com/chinaitop/depot/device/service/impl/BusinessImAssetServiceImpl.java

@@ -1,4 +1,6 @@
 package com.chinaitop.depot.device.service.impl;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -9,6 +11,7 @@ import com.chinaitop.depot.device.mapper.BusinessImAssetMapper;
 import com.chinaitop.depot.device.model.BusinessImAsset;
 import com.chinaitop.depot.device.model.BusinessImAssetExample;
 import com.chinaitop.depot.device.service.BusinessImAssetService;
+import com.chinaitop.depot.utils.ParameterUtil;
 
 
 @Service
@@ -43,8 +46,10 @@ public class BusinessImAssetServiceImpl implements BusinessImAssetService{
 	public void save(BusinessImAsset businessImAsset) {
 		// TODO Auto-generated method stub
 		if (businessImAsset.getId() == null) {
-			businessImAssetMapper.insert(businessImAsset);// 新增数据
+			businessImAsset.setCreatedate(new Date());
+			businessImAssetMapper.insertSelective(businessImAsset);// 新增数据
 		} else {
+			businessImAsset.setUpdatedate(new Date());
 			businessImAssetMapper.updateByPrimaryKeySelective(businessImAsset);// 修改数据
 		}
 	}
@@ -58,205 +63,64 @@ public class BusinessImAssetServiceImpl implements BusinessImAssetService{
 		// TODO Auto-generated method stub
 		return businessImAssetMapper.selectByPrimaryKey(id);
 	}
-	
-	
-	/**
-	 * 根据id删除数据
-	 *//*
-	
-
-	*//**
-	 * 提交修改和新增
-	 *//*
-	
 
-	*//**
-	 * 根据id查询数据
-	 *//*
-	
-
-	 *//**
-     * 获取入库的仓房名
-     *//*
+	//编号规则:ZC+年份+日期+00n 
 	@Override
-	public List<HouseNameBean> getHouseList() {
+	public String getAssetCode(Integer orgId) {
 		// TODO Auto-generated method stub
+		Calendar calendar = Calendar.getInstance();
+		String year = calendar.get(Calendar.YEAR)+"";
+		String month = calendar.get(Calendar.MONTH)+1+"";
+		String dayOfMonth = calendar.get(Calendar.DAY_OF_MONTH)+"";
+		 if(month.length()==1){
+			 month = "0"+month;
+		 }
+		 if(dayOfMonth.length()==1){
+			 dayOfMonth = "0" +dayOfMonth;
+		 }
+		String str = "ZC"+year+""+month+""+dayOfMonth;
 		
-		return deviceInputMapper.getHouseList();
-	}
-
-	@Override
-	public List<HouseTypeBean> getTypeList(Integer depotId) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getTypeList(depotId);
+		BusinessImAssetExample businessImAssetExample=new BusinessImAssetExample();
+		BusinessImAssetExample.Criteria criteria=businessImAssetExample.createCriteria();
+    	
+    	if(ParameterUtil.isnotnull(orgId)){
+    		criteria.andOrgIdEqualTo(orgId);
+    	}
+
+        //排序
+    	businessImAssetExample.setOrderByClause("id desc");
+    	List<BusinessImAsset> list = businessImAssetMapper.selectByExample(businessImAssetExample);
+    	if(list.size()>0){
+    		String assetCode= list.get(0).getAssetCode();
+    		String lastThreeChars  = assetCode.substring(assetCode.length()-3);
+    		
+    		String a = Integer.valueOf(lastThreeChars)+1+"";
+    		if(a.length()==1){
+    			a = "00"+a;
+    		}else if(a.length()==2){
+    			a = "0"+a;
+    		}
+    		
+    		String yearChars  = assetCode.substring(2,6);
+    		String monthChars  = assetCode.substring(6,10);
+
+    		if(!year.equals(yearChars)){
+    			if(!month.equals(monthChars)){
+        			str = str + "001";
+    			}
+    		}else{
+    			if((month+""+dayOfMonth).equals(monthChars)){
+        			str = str + a;
+    			}
+    		}
+    		
+    	}else{
+    		str = str + "001";     
+    	}
+		return str;
 	}
 	
-	//根据类型获取名称
-	@Override
-	public List<ShelfContentBean> getNameList(Integer depotTypeId) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getNameList(depotTypeId);
-	}
-	
-	@Override
-	public ContentBean getcontentGetList(String deviceName) {
-		// TODO Auto-generated method stub
-		Map<String, Object> map  = new HashMap<>();
-		map.put("deviceName", deviceName);
-		return deviceInputMapper.getcontentGetList(map);
-	}
-	
-	//根据类型获取货架
-	@Override
-	public List<ContentBean> getShelfGetList(String deviceName) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getShelfGetList(deviceName);
-	}
-
-	@Override
-	public List<StorageDeviceinput> queryByNumber(StorageDeviceinputExample example) {
-		return deviceInputMapper.selectByExample(example);
-	}
-
-	//查询仓房对应的设备名称
-	@Override
-	public List<StorageDeviceinput> getDeviceInputList(Integer depotId) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getDeviceInputList(depotId);
-	}
-
-	//查询设备名称对应的型号
-	@Override
-	public List<StorageDeviceinput> getModelList(String deviceName) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getModelList(deviceName);
-	}
 	
-	//查询型号对应的编号
-	@Override
-	public List<StorageDeviceinput> getNumberList(String deviceModel) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getNumberList(deviceModel);
-	}
 
-	//查询型号对应的数量
-	@Override
-	public List<StorageDeviceinput> getCountList(String number) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getCountList(number);
-	}
-
-	//报废
-	@Override
-	public void updateByPrimaryKeySelective(StorageDeviceinput storageDeviceinput) {
-		// TODO Auto-generated method stub
-		deviceInputMapper.updateByPrimaryKeySelective(storageDeviceinput);
-	}
-
-	@Override
-	public List<StorageDeviceinput> getAllList(String number) {
-		return deviceInputMapper.getAllList(number);
-	}
-
-	// 获取货架获取规格型号getModelGetList
-	@Override
-	public List<ContentBean> getModelGetList(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getModelGetList(map);
-	}
-
-	//获取规格型号对应的编号getNumberGetList
-	@Override
-	public List<StorageDeviceinput> getNumberGetList(String model) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getNumberGetList(model);
-	}
-
-	//根据编号获取可用数量
-	@Override
-	public List<StorageDeviceinput> getUseCountGetList(String number) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getUseCountGetList(number);
-	}
-
-	//获取编号和规格型号
-	@Override
-	public List<String> getDeviceModelList(Map<String,String> map) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getDeviceModelList(map);
-	}
-
-	@Override
-	public List<String> deviceSbCodeModelList(String deviceName, String model) {
-		return deviceInputMapper.deviceSbCodeModelList(deviceName,model);
-	}
-
-	//查询原有数量
-	@Override
-	public StorageDeviceinput selectById(Integer number) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.selectByPrimaryKey(number);
-	}
-
-	//获取保养名称
-	@Override
-	public List<String> getdevieName(String orgId) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getdevieName(orgId);
-	}
-
-	//获取维修名称
-	@Override
-	public List<String> getRepairNameList(String orgId) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getdevieName(orgId);
-	}
-
-	//领用时，根据规格型号和编号获取可用数量
-	@Override
-	public List<StorageDeviceinput> getUseCount(Map<String, Object> map) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getUseCount(map);
-	}
-
-	
-	//获取设备数据
-	@Override
-	public List<StorageDeviceinput> queryDevice(HashMap<Object, Object> map) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.queryDevice(map);
-	}
-
-	//获取维修的规格型号和编号
-	@Override
-	public List<StorageDeviceinput> getDeviceModelRepair(String deviceName) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.getDeviceModelRepair(deviceName);
-	}
-
-	@Override
-	public List<StorageDeviceinput> getDeviceModelListRepair(String deviceName) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	//获取每一类型入库的总数量
-	@Override
-	public List<Map<String, Object>> queryCountByType() {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.queryCountByType();
-	}
-
-	@Override
-	public List<StorageDeviceinput> queryDeviceAccount(StorageDeviceinputExample storageDeviceinputExample) {
-		// TODO Auto-generated method stub
-		return deviceInputMapper.queryDeviceAccount(storageDeviceinputExample);
-	}
-
-	@Override
-	public int deviceBySbCode(String sbCdoe) {
-		return Integer.valueOf(deviceInputMapper.deviceBySbCode(sbCdoe));
-	}
 
-*/
 }