各种修改

pom.xml

@@ -78,12 +78,6 @@
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>2.6.1</version>
 		</dependency>
-		<!-- swagger2markup添加 -->
-<!-- 		<dependency> -->
-<!-- 		    <groupId>io.github.swagger2markup</groupId> -->
-<!-- 		    <artifactId>swagger2markup</artifactId> -->
-<!-- 		    <version>1.3.3</version> -->
-<!-- 		</dependency> -->
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -101,6 +95,11 @@
 			<artifactId>fastjson</artifactId>
 			<version>1.2.37</version>
 		</dependency>
+<!--		<dependency>-->
+<!--			<groupId>com.alibaba</groupId>-->
+<!--			<artifactId>druid-spring-boot-starter</artifactId>-->
+<!--			<version>1.1.10</version>-->
+<!--		</dependency>-->
 		<!-- 定时需要的jar包 -->
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
@@ -196,108 +195,6 @@
                 	<failOnMissingWebXml>false</failOnMissingWebXml>
             	</configuration>
         	</plugin>
-        	<!-- swagger2markup添加 -->
-<!--         	<plugin> -->
-<!--                 <groupId>io.github.swagger2markup</groupId> -->
-<!--                 <artifactId>swagger2markup-maven-plugin</artifactId> -->
-<!--                 <version>${swagger2markup.version}</version> -->
-<!--                 <dependencies> -->
-<!--                     <dependency> -->
-<!--                         <groupId>io.github.swagger2markup</groupId> -->
-<!--                         <artifactId>swagger2markup-import-files-ext</artifactId> -->
-<!--                         <version>${swagger2markup.version}</version> -->
-<!--                     </dependency> -->
-<!--                     <dependency> -->
-<!--                         <groupId>io.github.swagger2markup</groupId> -->
-<!--                         <artifactId>swagger2markup-spring-restdocs-ext</artifactId> -->
-<!--                         <version>${swagger2markup.version}</version> -->
-<!--                     </dependency> -->
-<!--                 </dependencies> -->
-<!--                 <configuration> -->
-<!--                     <swaggerInput>http://localhost:9022/v2/api-docs</swaggerInput> -->
-<!--                     <outputDir>${generated.asciidoc.directory}</outputDir> -->
-<!--                     <config> -->
-<!--                         <swagger2markup.markupLanguage>ASCIIDOC</swagger2markup.markupLanguage> -->
-<!--                         <swagger2markup.pathsGroupedBy>TAGS</swagger2markup.pathsGroupedBy> -->
-
-<!--                         <swagger2markup.extensions.dynamicOverview.contentPath>${project.basedir}/src/docs/asciidoc/extensions/overview</swagger2markup.extensions.dynamicOverview.contentPath> -->
-<!--                         <swagger2markup.extensions.dynamicDefinitions.contentPath>${project.basedir}/src/docs/asciidoc/extensions/definitions</swagger2markup.extensions.dynamicDefinitions.contentPath> -->
-<!--                         <swagger2markup.extensions.dynamicPaths.contentPath>${project.basedir}/src/docs/asciidoc/extensions/paths</swagger2markup.extensions.dynamicPaths.contentPath> -->
-<!--                         <swagger2markup.extensions.dynamicSecurity.contentPath>${project.basedir}src/docs/asciidoc/extensions/security/</swagger2markup.extensions.dynamicSecurity.contentPath> -->
-
-<!--                         <swagger2markup.extensions.springRestDocs.snippetBaseUri>${swagger.snippetOutput.dir}</swagger2markup.extensions.springRestDocs.snippetBaseUri> -->
-<!--                         <swagger2markup.extensions.springRestDocs.defaultSnippets>true</swagger2markup.extensions.springRestDocs.defaultSnippets> -->
-<!--                     </config> -->
-<!--                 </configuration> -->
-<!--                 <executions> -->
-<!--                     <execution> -->
-<!--                         <phase>test</phase> -->
-<!--                         <goals> -->
-<!--                             <goal>convertSwagger2markup</goal> -->
-<!--                         </goals> -->
-<!--                     </execution> -->
-<!--                 </executions> -->
-<!--             </plugin> -->
-<!--             <plugin> -->
-<!--                 <groupId>org.asciidoctor</groupId> -->
-<!--                 <artifactId>asciidoctor-maven-plugin</artifactId> -->
-<!--                 <version>1.5.6</version> -->
-<!--                 Include Asciidoctor PDF for pdf generation -->
-<!--                 <dependencies> -->
-<!--                     <dependency> -->
-<!--                         <groupId>org.asciidoctor</groupId> -->
-<!--                         <artifactId>asciidoctorj-pdf</artifactId> -->
-<!--                         <version>1.5.0-alpha.16</version> -->
-<!--                     </dependency> -->
-<!--                     <dependency> -->
-<!--                         <groupId>org.jruby</groupId> -->
-<!--                         <artifactId>jruby-complete</artifactId> -->
-<!--                         <version>1.7.21</version> -->
-<!--                     </dependency> -->
-<!--                 </dependencies> -->
-<!--                 Configure generic document generation settings -->
-<!--                 <configuration> -->
-<!--                     <sourceDirectory>${asciidoctor.input.directory}</sourceDirectory> -->
-<!--                     <sourceDocumentName>index.adoc</sourceDocumentName> -->
-<!--                     <attributes> -->
-<!--                         <doctype>book</doctype> -->
-<!--                         <toc>left</toc> -->
-<!--                         <toclevels>3</toclevels> -->
-<!--                         <numbered></numbered> -->
-<!--                         <hardbreaks></hardbreaks> -->
-<!--                         <sectlinks></sectlinks> -->
-<!--                         <sectanchors></sectanchors> -->
-<!--                         <generated>${generated.asciidoc.directory}</generated> -->
-<!--                     </attributes> -->
-<!--                 </configuration> -->
-<!--                 Since each execution can only handle one backend, run separate executions for each desired output type -->
-<!--                 <executions> -->
-<!--                     <execution> -->
-<!--                         <id>output-html</id> -->
-<!--                         <phase>test</phase> -->
-<!--                         <goals> -->
-<!--                             <goal>process-asciidoc</goal> -->
-<!--                         </goals> -->
-<!--                         <configuration> -->
-<!--                             <backend>html5</backend> -->
-<!--                             <outputDirectory>${asciidoctor.html.output.directory}</outputDirectory> -->
-<!--                         </configuration> -->
-<!--                     </execution> -->
-
-<!--                     <execution> -->
-<!--                         <id>output-pdf</id> -->
-<!--                         <phase>test</phase> -->
-<!--                         <goals> -->
-<!--                             <goal>process-asciidoc</goal> -->
-<!--                         </goals> -->
-<!--                         <configuration> -->
-<!--                             <backend>pdf</backend> -->
-<!--                             <outputDirectory>${asciidoctor.pdf.output.directory}</outputDirectory> -->
-<!--                         </configuration> -->
-<!--                     </execution> -->
-
-<!--                 </executions> -->
-<!--             </plugin> -->
 		</plugins>
 
 		<!-- 如果不添加此节点mybatis的mapper.xml文件都会被漏掉。 -->
@@ -325,29 +222,6 @@
 				<enabled>false</enabled>
 			</snapshots>
 		</repository>
-		<!-- swagger2markup添加 -->
-<!-- 		<repository> -->
-<!-- 	        <snapshots> -->
-<!-- 	            <enabled>true</enabled> -->
-<!-- 	            <updatePolicy>always</updatePolicy> -->
-<!-- 	        </snapshots> -->
-<!-- 	        <id>jcenter-releases</id> -->
-<!-- 	        <name>jcenter</name> -->
-<!-- 	        <url>http://jcenter.bintray.com</url> -->
-<!-- 	    </repository> -->
-<!-- 	    <repository> -->
-<!--             <id>jcentral</id> -->
-<!--             <name>bintray</name> -->
-<!--             <url>http://jcenter.bintray.com</url> -->
-<!--             <snapshots> -->
-<!--                 <enabled>false</enabled> -->
-<!--             </snapshots> -->
-<!--         </repository> -->
-<!--         <repository> -->
-<!--             <id>jcenter-snapshots</id> -->
-<!--             <name>jcenter</name> -->
-<!--             <url>http://oss.jfrog.org/artifactory/oss-snapshot-local/</url> -->
-<!--         </repository> -->
 	</repositories>
 
 

src/main/java/com/chinaitop/DepotBasicApplication.java

@@ -20,6 +20,8 @@ import com.github.pagehelper.autoconfigure.PageHelperAutoConfiguration;
 public class DepotBasicApplication {
 
 	public static void main(String[] args) {
+		System.setProperty("druid.testWhileIdle", "true");
+		System.setProperty("druid.validationQuery", "SELECT 1 FROM DUAL");
 		SpringApplication.run(DepotBasicApplication.class, args);
 	}
 }

src/main/java/com/chinaitop/depot/basic/controller/BasicEnumController.java

@@ -332,12 +332,13 @@ public class BasicEnumController {
     @ApiOperation(value="根据名称和父ID获取ID", notes="根据名称和父ID获取ID")
     @ApiImplicitParams({
     	@ApiImplicitParam(name="parentId", value="父ID", paramType="query"),
-    	@ApiImplicitParam(name="enumName", value="名称", paramType="query")
+    	@ApiImplicitParam(name="enumName", value="名称", paramType="query"),
+		@ApiImplicitParam(name="code", value="字典国标编码模糊值", paramType="query")
     })
-    public Map<String, Object> getIdByNameAndParentId(Integer parentId,String enumName) {
+    public Map<String, Object> getIdByNameAndParentId(Integer parentId,String enumName, String code) {
     	Map<String, Object> modelMap = null;
     	try {
-    		modelMap = enumService.getIdByNameAndParentId(parentId, enumName);
+    		modelMap = enumService.getIdByNameAndParentId(parentId, enumName, code);
     	} catch (Exception e) {
     		e.printStackTrace();
     	}

src/main/java/com/chinaitop/depot/basic/service/BasicEnumService.java

@@ -81,9 +81,10 @@ public interface BasicEnumService {
 	 * 
 	 * @param parentId 父ID
 	 * @param enumName 字典名称
+	 * @param code 国标编码前几位模糊值
 	 * @return
 	 * @throws Exception
 	 */
-	Map<String, Object> getIdByNameAndParentId(Integer parentId,String enumName) throws Exception;
+	Map<String, Object> getIdByNameAndParentId(Integer parentId, String enumName, String code) throws Exception;
 
 }

src/main/java/com/chinaitop/depot/basic/service/BasicTankService.java

@@ -55,7 +55,7 @@ public interface BasicTankService {
 
 	/**
 	 * 修改油罐的出入库状态
-	 * @param tankJson
+	 * @param basicTank
 	 */
 	void updateTankCrkStatus(BasicTank basicTank) throws Exception;
 }

src/main/java/com/chinaitop/depot/basic/service/impl/BasicEnumServiceImpl.java

@@ -8,6 +8,7 @@ import java.util.Map;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import com.chinaitop.depot.basic.mapper.BasicEnumMapper;
@@ -226,7 +227,7 @@ public class BasicEnumServiceImpl implements BasicEnumService {
     }
 
 	@Override
-	public Map<String, Object> getIdByNameAndParentId(Integer parentId, String enumName) throws Exception {
+	public Map<String, Object> getIdByNameAndParentId(Integer parentId, String enumName, String code) throws Exception {
 		Map<String, Object> modelMap = new HashMap<>();
 
 		Integer enumId = 0;
@@ -240,6 +241,9 @@ public class BasicEnumServiceImpl implements BasicEnumService {
 		if (null != parentId) {
 			Criteria.andParentidEqualTo(parentId); //只查询顶级菜单
 		}
+		if (StringUtils.isNotBlank(code)) {
+			Criteria.andGbcodeLike("%"+code+"%");
+		}
 
 		List<BasicEnum> list = enumMapper.selectByExample(enumExample);
 		if(list.size()>0){

src/main/java/com/chinaitop/depot/basic/service/impl/BasicTankServiceImpl.java

@@ -78,7 +78,7 @@ public class BasicTankServiceImpl implements BasicTankService {
     public void saveOrEdit(HttpServletRequest request, BasicTank basicTank,Integer orgId) {
 		basicTank.setDelFlag(1);
 		basicTank.setOrgId(orgId);
-		basicTank.setUpdatetime(new Date());
+		//basicTank.setUpdatetime(new Date());
 		
 		//组装油罐货位
 		String org_obj = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");

src/main/java/com/chinaitop/depot/basic/service/impl/BasicWarehouseServiceImpl.java

@@ -11,6 +11,7 @@ import javax.annotation.Resource;
 import com.chinaitop.depot.Object.HwObj;
 import com.chinaitop.depot.Object.YwConstant;
 import com.chinaitop.depot.basic.mapper.BasicStorehouseMapper;
+import com.chinaitop.depot.basic.mapper.BasicTankHwMapper;
 import com.chinaitop.depot.basic.mapper.BasicTankMapper;
 import com.chinaitop.depot.basic.model.*;
 import com.chinaitop.utils.ParameterUtil;
@@ -37,6 +38,9 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 	private BasicTankMapper bankMapper;
 
 	@Resource
+	private BasicTankHwMapper tankHwMapper;
+
+	@Resource
 	private BasicStorehouseMapper storehouseMapper;
 	
 	@Override
@@ -79,7 +83,7 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 			new_warehouse.setUpdatedate(date);
 			BasicStorehouse storehouse = storehouseMapper.selectByPrimaryKey(new_warehouse.getStorehouseId());
 			new_warehouse.setHwdm(BusinessUtils.setBZhwbm(storehouse.getAjbm(), new_warehouse.getWarehouseCode()));
-			new_warehouse.setUpdatetime(date);
+			//new_warehouse.setUpdatetime(date);
 			warehouseMapper.updateByPrimaryKey(new_warehouse);
 
 			//如果是出库或空仓，需要把当前货位的业务数据进行归档等操作
@@ -105,7 +109,7 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 			}
 			new_warehouse.setCreatename(userName);
 			new_warehouse.setCreatedate(date);
-			new_warehouse.setUpdatetime(date);
+			//new_warehouse.setUpdatetime(date);
 			new_warehouse.setDelFlag(1);
 			add(new_warehouse);
 		}
@@ -240,7 +244,6 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 				hwdm = BusinessUtils.setBZhwbm(storehouse.getAjbm(), warehouse.getWarehouseCode());
 				warehouse.setHwdm(hwdm);
 			}
-			warehouse.setUpdatetime(storehouse.getCreatedate());
 			if (null == warehouse.getWarehouseId()) {//没有货位ID那就是新增
 				warehouse.setStorehouseId(storehouse.getStorehouseId());
 				warehouse.setCreatename(storehouse.getCreatename());
@@ -281,6 +284,11 @@ public class BasicWarehouseServiceImpl implements BasicWarehouseService {
 						bank.setLylx(obj.getLylx());
 					}
 					bankMapper.updateByPrimaryKeySelective(bank);
+					BasicTankHw tankHw = new BasicTankHw();
+					tankHw.setId(Integer.parseInt(obj.getWareId()));
+					tankHw.setCrkStatus(obj.getStatus());
+					tankHw.setZhgxsj(new Date());
+					tankHwMapper.updateByPrimaryKeySelective(tankHw);
 					//如果不是封仓，需要把当前货位的业务数据进行归档等操作
 					if (!"3".equals(obj.getStatus())) {//出库或者空仓
 						Map<String, Object> lqkmap = new HashMap<String, Object>();

src/main/java/com/chinaitop/depot/utils/BusinessUtils.java

@@ -17,11 +17,26 @@ public class BusinessUtils {
 	//油罐
 	private final static String IS_TANK = "1";
 
-	
+	/**
+	 * 组合库区标准编码
+	 *
+	 * @param zzdm 18位统一性用社代码
+	 * @param orgId 单位ID
+	 * @return
+	 */
+	public static String setBZkqbm(String zzdm, Integer orgId) {
+		String kqbm = "";
+		StringBuffer sbf = new StringBuffer();
+		//把单位ID格式化成3位，不足三位的补0
+		String sxm = String.format("%03d", orgId);
+		sbf.append(zzdm).append(sxm);
+		kqbm = sbf.toString().trim();
+		return kqbm;
+	}
 
 	/**
-	 * 组合仓房/油罐标准编码
-	 * 规则：仓房/油罐标准编码=所属单位18位统一信用代码+001+仓房/油罐3位编码
+	 * 组装仓房/油罐标准编码
+	 * 规则：仓房/油罐标准编码=所属单位18位统一信用代码+三位数的orgId+仓房/油罐3位编码
 	 * @param dwbm 单位编码
 	 * @param code 仓房或油罐编码
 	 * @param typeCode 类型标识：0仓房,1油罐
@@ -31,14 +46,10 @@ public class BusinessUtils {
 	public static String setBZcfandygbm(String dwbm, String code, String typeCode, String orgId) {
 		String cfdm = "";
 		StringBuffer sbf = new StringBuffer();
-		//sbf.append(dwbm).append("001").append(typeCode).append(code);
-		if (orgId.length()==1) {
-			sbf.append(dwbm).append("00").append(orgId);
-		} else if (orgId.length()==2) {
-			sbf.append(dwbm).append("0").append(orgId);
-		} else if (orgId.length()==3) {
-			sbf.append(dwbm).append(orgId);
-		}
+		//把单位ID格式化成3位，不足三位的补0
+		String sxm = String.format("%03d", Integer.parseInt(orgId));
+		sbf.append(dwbm).append(sxm);
+		//仓房或油罐的标识+对应的三位编码
 		sbf.append(typeCode).append(code);
 		cfdm = sbf.toString().trim();
 		return cfdm;
@@ -48,7 +59,7 @@ public class BusinessUtils {
 	 * 组合廒间标准编码
 	 * 规则：廒间标准编码=仓房/油罐标准编码+3位廒间编码
 	 * @param cfbm 仓房/油罐标准编码
-	 * @param cfType 仓房类型
+	 * @param cfType 仓房类型(简易仓、简易囤、罩棚这三种是属于简易仓，其它类型的仓房都是正常仓房)
 	 * @param typeCode 类型标识：0仓房,1油罐
 	 * @return
 	 */
@@ -60,12 +71,12 @@ public class BusinessUtils {
 		sbf.append(cfbm);
 
 		if (IS_TANK.equals(typeCode)) {
-			sbf.append(YG_CODE);
-		} else {
+			sbf.append(YG_CODE);//代表是油罐
+		} else {//代表是仓房
 			if (JY_NUME_ID.equals(cfType)) {
-				sbf.append(JY_CODE);
+				sbf.append(JY_CODE);//代表是简易仓
 			} else {
-				sbf.append(AJ_CODE);
+				sbf.append(AJ_CODE);//其它正常仓房
 			}
 		}
 
@@ -76,10 +87,9 @@ public class BusinessUtils {
 
 	/**
 	 * 组合货位标准编码
-	 * 规则：货位标准编码=所属仓房编码+所属廒间编码+货位编码
-	 * 也就是说廒间标准编码+货位编码就是货位的标准编码
-	 * @param ajbm
-	 * @param hwbm
+	 * 规则：货位标准编码=所属廒间标准编码+货位编码(2位)
+	 * @param ajbm 廒间标准编码
+	 * @param hwbm 货位编码(2位)
 	 * @return
 	 */
 	public static String setBZhwbm(String ajbm, String hwbm) {

src/main/java/com/chinaitop/utils/ParameterUtil.java

@@ -1,18 +1,12 @@
 package com.chinaitop.utils;
 
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.DateUtil;
-
 import java.io.BufferedInputStream;
 import java.io.InputStream;
-import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Properties;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 public class ParameterUtil {
 
@@ -110,21 +104,9 @@ public class ParameterUtil {
     }
 
     public static void main(String[] args) {
-//        System.out.println(stampToDate("1504689208643"));
-//        System.out.println(getTimeStamp(getSysDateTime()));
-//        String ip = "([1-9]|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])(\\.(\\d|[1-9]\\d|1\\d{2}|2[0-4]\\d|25[0-5])){3}";
-//        Pattern pattern = Pattern.compile(ip);
-//        Matcher matcher = pattern.matcher("172.16.10.150");
-//        matcher.matches();
-//        //System.out.println(matcher.matches());
-//
-//        String a = "1.16.10.1";
-//        boolean isNum = a.matches(ip);
-//        System.out.println(isNum);
-    	
-    	String a = " a  b   d  ";
-    	System.out.println(a);
-    	System.out.println(a.replace(" ", ""));
+        Properties p = System.getProperties();
+        String property = p.getProperty("server.port");
+        System.out.println(property);
     }
     public static String getBHS(String BHS){
         String[] str = BHS.split(",");