Merge branch 'dev' of depot-qinghai/depot-system-qinghai into master

src/main/java/com/chinaitop/depot/sqr/service/impl/BizSqrEnterpriseApplyServiceImpl.java

@@ -169,7 +169,9 @@ public class BizSqrEnterpriseApplyServiceImpl implements BizSqrEnterpriseApplySe
 
                     if(bizSqrEnterpriseApply.getApplyType()!=4){
                         auditRequestMapper.delete(bizSqrEnterpriseApply.getId()+"");
-                        bizSqrEnterpriseService.delete(bizSqrEnterpriseApply.getSqrEnterpriseId());
+                        if(bizSqrEnterpriseApply.getApplyType()==1){
+                            bizSqrEnterpriseService.delete(bizSqrEnterpriseApply.getSqrEnterpriseId());
+                        }
                         bizSqrEnterpriseApplyMapper.delete(bizSqrEnterpriseApply.getId());
                         saveAndcreatEbizSqrEnterprise(bizSqrEnterpriseApply,userName);
                         saveAndcreatRequest(bizSqrEnterpriseApply,userName);

src/main/java/com/chinaitop/depot/system/controller/FuncInfoController.java

@@ -78,9 +78,12 @@ public class FuncInfoController {
 	 */
 	@RequestMapping(value="/getFuncList", method = RequestMethod.GET)
 	@ApiOperation(value="功能列表", notes = "查询功能列表")
-	public List<FuncInfo> getFuncInfo() {
+	public List<FuncInfo> getFuncInfo(String funcName) {
 		FuncInfoExample example = new FuncInfoExample();
 		Criteria criteria = example.createCriteria();
+		if (StringUtils.isNotBlank(funcName)) {
+			criteria.andFuncNameLike("%" + funcName + "%");
+		}
 		return funcInfoService.queryByExample(example);	
 	}
 	

src/main/java/com/chinaitop/depot/system/controller/UserInfoController.java

@@ -147,11 +147,11 @@ public class UserInfoController {
         	criteria.andOrgIdEqualTo(Integer.valueOf(orgIds));
         }
 		
-		List<UserInfo> listAll = userInfoService.queryByExample(example);
-		
-		if (pageNum!=null && pageSize!=null) {
+        if (pageNum!=null && pageSize!=null) {
 			PageHelper.startPage(pageNum, pageSize);
 		}
+        
+		List<UserInfo> listAll = userInfoService.queryByExample(example);
 		
 		PageInfo<UserInfo> pageInfo = new PageInfo<UserInfo>(listAll);
 		return pageInfo;
@@ -380,18 +380,24 @@ public class UserInfoController {
 		try {
 			// JSON字符串转对象
 			ObjectMapper mapper = new ObjectMapper();
-			String userInfoObject = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
-			if(!userInfoObject.isEmpty()) {
-				UserInfo userInfo = mapper.readValue(userInfoObject, UserInfo.class);
-				//UserInfo userInfo = (UserInfo)request.getSession().getAttribute("userInfo");
-				modelMap.put("userInfo", userInfo);
-			}
+			
+			String orgName = "";
 			String orgInfoObject = ObjectUtils.toString(request.getSession().getAttribute("orgInfo"),"");
 			if(!orgInfoObject.isEmpty()) {
 				OrgInfo orgInfo = mapper.readValue(orgInfoObject, OrgInfo.class);
 				//OrgInfo orgInfo = (OrgInfo)request.getSession().getAttribute("orgInfo");
+				orgName = orgInfo.getOrgName();
 				modelMap.put("orgInfo", orgInfo);
 			}
+			
+			String userInfoObject = ObjectUtils.toString(request.getSession().getAttribute("userInfo"),"");
+			if(!userInfoObject.isEmpty()) {
+				UserInfo userInfo = mapper.readValue(userInfoObject, UserInfo.class);
+				//UserInfo userInfo = (UserInfo)request.getSession().getAttribute("userInfo");
+				userInfo.setOrgName(orgName);
+				modelMap.put("userInfo", userInfo);
+			}
+			
 			String depotInfoObject = ObjectUtils.toString(request.getSession().getAttribute("depotInfo"),"");
 			if(!depotInfoObject.isEmpty()) {
 				OrgInfo depotInfo = mapper.readValue(depotInfoObject, OrgInfo.class);

src/main/java/com/chinaitop/depot/system/controller/UserRoleController.java

@@ -56,5 +56,13 @@ public class UserRoleController {
 		
 		return userRoleService.getUserRoleFeign(userId);
 	}
+	
+	/**
+	 * 给 特定的账号 赋予 管理员的角色
+	 */
+	@RequestMapping(value="/addRoleToUser", method=RequestMethod.GET)
+	public void addRoleToUser() {
+		 userRoleService.addRoleToUser();
+	}
 
 }

src/main/java/com/chinaitop/depot/system/mapper/OrgInfoMapper.xml

@@ -15,7 +15,7 @@
     <result column="charge_person" property="chargePerson" jdbcType="VARCHAR" />
     <result column="longitude" property="longitude" jdbcType="VARCHAR" />
     <result column="latitude" property="latitude" jdbcType="VARCHAR" />
-    <result column="regist_capital" property="registCapital" jdbcType="INTEGER" />
+    <result column="regist_capital" property="registCapital" jdbcType="DECIMAL" />
     <result column="work_number" property="workNumber" jdbcType="INTEGER" />
     <result column="area_code" property="areaCode" jdbcType="INTEGER" />
     <result column="area_name" property="areaName" jdbcType="VARCHAR" />
@@ -68,6 +68,8 @@
     <result column="zc_city" property="zcCity" jdbcType="INTEGER" />
     <result column="zc_county" property="zcCounty" jdbcType="INTEGER" />
     <result column="unit_info_id" property="unitInfoId" jdbcType="VARCHAR" />
+    
+    <result column="tykqbm" property="tykqbm" jdbcType="VARCHAR" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.chinaitop.depot.system.model.OrgInfo">
     <result column="wjl" jdbcType="LONGVARCHAR" property="wjl" />
@@ -139,7 +141,7 @@
     parent_id, status, del_flag, birds_eye, birds_Remote, brief_introduction, invoice_title, 
     regist_number, bank_name, account_name, account_number,level_code,total_assets,corporate_capacity,
     office_phone,registered_address,mail_box,official_website,house_number,tank_number,depot_property,updatetime,
-    cityCouncil_code,frlxfs,yxgr,kqbm,sfzk, kq_number, zc_province, zc_city, zc_county,unit_info_id
+    cityCouncil_code,frlxfs,yxgr,kqbm,sfzk, kq_number, zc_province, zc_city, zc_county,unit_info_id,tykqbm
   </sql>
   <select id="selectByExample" resultMap="BaseResultMap" parameterType="com.chinaitop.depot.system.model.OrgInfoExample" >
     select
@@ -191,12 +193,12 @@
       account_number,total_assets,corporate_capacity,
       office_phone,registered_address,mail_box,official_website,
       house_number,tank_number,depot_property,level_code,wjl,frlxfs,yxgr,kqbm,sfzk, kq_number, zc_province, zc_city, zc_county,
-      unit_info_id)
+      unit_info_id,tykqbm)
     values (#{orgId,jdbcType=INTEGER}, #{orgName,jdbcType=VARCHAR}, #{shortName,jdbcType=VARCHAR}, 
       #{orgCode,jdbcType=VARCHAR}, #{orgClassId,jdbcType=INTEGER}, #{companyNature,jdbcType=INTEGER}, 
       #{busiType,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{contact,jdbcType=VARCHAR}, 
       #{fax,jdbcType=VARCHAR}, #{chargePerson,jdbcType=VARCHAR}, #{longitude,jdbcType=VARCHAR}, 
-      #{latitude,jdbcType=VARCHAR}, #{registCapital,jdbcType=INTEGER}, #{workNumber,jdbcType=INTEGER}, 
+      #{latitude,jdbcType=VARCHAR}, #{registCapital,jdbcType=DECIMAL}, #{workNumber,jdbcType=INTEGER}, 
       #{areaCode,jdbcType=INTEGER}, #{areaName,jdbcType=VARCHAR}, #{post,jdbcType=VARCHAR}, 
       #{depotClass,jdbcType=INTEGER}, #{designCapacity,jdbcType=DECIMAL}, #{effectiveCapacity,jdbcType=DECIMAL}, 
       #{depotArea,jdbcType=DECIMAL}, #{completeDate,jdbcType=TIMESTAMP}, #{useDate,jdbcType=TIMESTAMP}, 
@@ -213,7 +215,7 @@
       #{depotProperty,jdbcType=VARCHAR}, #{levelCode,jdbcType=VARCHAR}, #{wjl,jdbcType=LONGVARCHAR},
       #{frlxfs,jdbcType=VARCHAR}, #{yxgr,jdbcType=DECIMAL}, #{kqbm,jdbcType=VARCHAR}, #{sfzk,jdbcType=VARCHAR},
       #{kqNumber,jdbcType=INTEGER}, #{zcProvince,jdbcType=INTEGER},#{zcCity,jdbcType=INTEGER}, #{zcCounty,jdbcType=INTEGER},
-      #{unitInfoId,jdbcType=VARCHAR})
+      #{unitInfoId,jdbcType=VARCHAR},#{tykqbm,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.chinaitop.depot.system.model.OrgInfo" useGeneratedKeys="true" keyProperty="orgId">
     insert into org_info
@@ -383,6 +385,9 @@
       <if test="unitInfoId != null" >
         unit_info_id,
       </if>
+      <if test="tykqbm != null" >
+        tykqbm,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="orgId != null" >
@@ -425,7 +430,7 @@
         #{latitude,jdbcType=VARCHAR},
       </if>
       <if test="registCapital != null" >
-        #{registCapital,jdbcType=INTEGER},
+        #{registCapital,jdbcType=DECIMAL},
       </if>
       <if test="workNumber != null" >
         #{workNumber,jdbcType=INTEGER},
@@ -550,6 +555,9 @@
       <if test="unitInfoId != null">
         #{unitInfoId,jdbcType=VARCHAR},
       </if>
+      <if test="tykqbm != null">
+        #{tykqbm,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.chinaitop.depot.system.model.OrgInfoExample" resultType="java.lang.Integer" >
@@ -601,7 +609,7 @@
         latitude = #{record.latitude,jdbcType=VARCHAR},
       </if>
       <if test="record.registCapital != null" >
-        regist_capital = #{record.registCapital,jdbcType=INTEGER},
+        regist_capital = #{record.registCapital,jdbcType=DECIMAL},
       </if>
       <if test="record.workNumber != null" >
         work_number = #{record.workNumber,jdbcType=INTEGER},
@@ -729,6 +737,9 @@
       <if test="record.unitInfoId != null">
         unit_info_id = #{record.unitInfoId,jdbcType=VARCHAR},
       </if>
+      <if test="record.tykqbm != null">
+        tykqbm = #{record.tykqbm,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
@@ -749,7 +760,7 @@
       charge_person = #{record.chargePerson,jdbcType=VARCHAR},
       longitude = #{record.longitude,jdbcType=VARCHAR},
       latitude = #{record.latitude,jdbcType=VARCHAR},
-      regist_capital = #{record.registCapital,jdbcType=INTEGER},
+      regist_capital = #{record.registCapital,jdbcType=DECIMAL},
       work_number = #{record.workNumber,jdbcType=INTEGER},
       area_code = #{record.areaCode,jdbcType=INTEGER},
       area_name = #{record.areaName,jdbcType=VARCHAR},
@@ -790,7 +801,8 @@
       zc_province = #{record.zcProvince,jdbcType=INTEGER},
       zc_city = #{record.zcCity,jdbcType=INTEGER},
       zc_county = #{record.zcCounty,jdbcType=INTEGER},
-      unit_info_id = #{record.unitInfoId,jdbcType=VARCHAR}
+      unit_info_id = #{record.unitInfoId,jdbcType=VARCHAR},
+      tykqbm = #{record.tykqbm,jdbcType=VARCHAR}
     <if test="_parameter != null" >
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -835,7 +847,7 @@
         latitude = #{latitude,jdbcType=VARCHAR},
       </if>
       <if test="registCapital != null" >
-        regist_capital = #{registCapital,jdbcType=INTEGER},
+        regist_capital = #{registCapital,jdbcType=DECIMAL},
       </if>
       <if test="workNumber != null" >
         work_number = #{workNumber,jdbcType=INTEGER},
@@ -990,6 +1002,9 @@
       <if test="unitInfoId != null" >
         unit_info_id = #{unitInfoId,jdbcType=VARCHAR},
       </if>
+      <if test="tykqbm != null" >
+        tykqbm = #{tykqbm,jdbcType=VARCHAR},
+      </if>
     </set>
     where org_id = #{orgId,jdbcType=INTEGER}
   </update>
@@ -1007,7 +1022,7 @@
       charge_person = #{chargePerson,jdbcType=VARCHAR},
       longitude = #{longitude,jdbcType=VARCHAR},
       latitude = #{latitude,jdbcType=VARCHAR},
-      regist_capital = #{registCapital,jdbcType=INTEGER},
+      regist_capital = #{registCapital,jdbcType=DECIMAL},
       work_number = #{workNumber,jdbcType=INTEGER},
       area_code = #{areaCode,jdbcType=INTEGER},
       area_name = #{areaName,jdbcType=VARCHAR},
@@ -1058,7 +1073,8 @@
       zc_province = #{zcProvince,jdbcType=INTEGER},
       zc_city = #{zcCity,jdbcType=INTEGER},
       zc_county = #{zcCounty,jdbcType=INTEGER},
-      unit_info_id = #{unitInfoId,jdbcType=VARCHAR}
+      unit_info_id = #{unitInfoId,jdbcType=VARCHAR},
+      tykqbm = #{tykqbm,jdbcType=VARCHAR}
     where org_id = #{orgId,jdbcType=INTEGER}
   </update>
   <update id="updateOrgLevel" parameterType="map" statementType="CALLABLE" >

src/main/java/com/chinaitop/depot/system/model/OrgInfo.java

@@ -12,6 +12,8 @@ public class OrgInfo implements Serializable {
     
     private String unitInfoId;
     
+    private String tykqbm;
+    
     public String getUnitInfoId() {
 		return unitInfoId;
 	}
@@ -19,6 +21,18 @@ public class OrgInfo implements Serializable {
 	public void setUnitInfoId(String unitInfoId) {
 		this.unitInfoId = unitInfoId;
 	}
+	
+	
+
+	public String getTykqbm() {
+		return tykqbm;
+	}
+
+	public void setTykqbm(String tykqbm) {
+		this.tykqbm = tykqbm;
+	}
+
+
 
 	private Integer orgId;
 
@@ -46,7 +60,7 @@ public class OrgInfo implements Serializable {
 
     private String latitude;
 
-    private Integer registCapital;
+    private BigDecimal registCapital;
 
     private Integer workNumber;
 
@@ -258,11 +272,11 @@ public class OrgInfo implements Serializable {
         this.latitude = latitude == null ? null : latitude.trim();
     }
 
-    public Integer getRegistCapital() {
+    public BigDecimal getRegistCapital() {
         return registCapital;
     }
 
-    public void setRegistCapital(Integer registCapital) {
+    public void setRegistCapital(BigDecimal registCapital) {
         this.registCapital = registCapital;
     }
 

src/main/java/com/chinaitop/depot/system/service/UserRoleService.java

@@ -16,4 +16,6 @@ public interface UserRoleService {
 
 	List<Map<String, String>> getUserRoleFeign(Integer userId);
 
+	void addRoleToUser();
+
 }

src/main/java/com/chinaitop/depot/system/service/impl/DataDockingServiceImpl.java

@@ -136,7 +136,7 @@ public class DataDockingServiceImpl implements DataDockingService {
     	//注册资本zczb
     	String zczb = obj.getString("zczb");
     	if (StringUtils.isNotBlank(zczb)) {
-    		orgInfo.setRegistCapital((int) Double.parseDouble(zczb.trim()));
+    		orgInfo.setRegistCapital(new BigDecimal(zczb));
     	}
 
     	//资产总额zcze

src/main/java/com/chinaitop/depot/system/service/impl/OrgInfoServiceImpl.java

@@ -9,7 +9,6 @@ import javax.annotation.Resource;
 
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
@@ -19,8 +18,6 @@ import com.chinaitop.depot.system.mapper.OrgInfoMapper;
 import com.chinaitop.depot.system.model.OrgInfo;
 import com.chinaitop.depot.system.model.OrgInfoExample;
 import com.chinaitop.depot.system.service.OrgInfoService;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Service
 public class OrgInfoServiceImpl implements OrgInfoService {
@@ -60,6 +57,8 @@ public class OrgInfoServiceImpl implements OrgInfoService {
 		
 		this.gjjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "i");
 		
+		this.gjjwjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "i");
+		
 	}
 
 	@Override
@@ -71,6 +70,8 @@ public class OrgInfoServiceImpl implements OrgInfoService {
 		 * 国家局数据
 		 */
 		this.gjjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "u");
+		
+		this.gjjwjjk(orgInfo.getOrgId(), orgInfo.getOrgId(), "u");
 	}
 
 	@Override
@@ -83,6 +84,9 @@ public class OrgInfoServiceImpl implements OrgInfoService {
 		 */
 		
 		this.gjjjk(orgId, orgId, "d");
+		
+		this.gjjwjjk(orgId, orgId, "d");
+		
 	}
 
 	@Override
@@ -239,4 +243,26 @@ public class OrgInfoServiceImpl implements OrgInfoService {
            
     	
        }
+       
+       public void gjjwjjk(Integer id, Integer orgId,String czbz) {
+           
+     	  String tableName = "ODS_UP_WJXXJK";
+    		/**
+             * restTemplate调用
+             */
+            //String url = "http://localhost:9022/recPublish/sendMessage";//
+            //发送post请求，并打印结果，以String类型接收响应结果JSON字符串
+    		
+            MultiValueMap<String, Object> sendMap = new LinkedMultiValueMap<>();
+    		sendMap.add("tableName", tableName);
+    		sendMap.add("czbz", czbz);
+    		sendMap.add("ywId", id);
+    		sendMap.add("orgId", orgId);
+
+         restTemplate.postForObject(jsgjjsjUrl, sendMap, String.class);
+            
+     	
+        }
+
+	
 }

src/main/java/com/chinaitop/depot/system/service/impl/UserRoleServiceImpl.java

@@ -1,8 +1,21 @@
 package com.chinaitop.depot.system.service.impl;
 
+import com.chinaitop.depot.system.mapper.FuncInfoMapper;
+import com.chinaitop.depot.system.mapper.RoleFuncMapper;
+import com.chinaitop.depot.system.mapper.RoleInfoMapper;
+import com.chinaitop.depot.system.mapper.UserInfoMapper;
 import com.chinaitop.depot.system.mapper.UserRoleMapper;
+import com.chinaitop.depot.system.model.FuncInfo;
+import com.chinaitop.depot.system.model.FuncInfoExample;
+import com.chinaitop.depot.system.model.RoleFunc;
+import com.chinaitop.depot.system.model.RoleFuncExample;
+import com.chinaitop.depot.system.model.RoleInfo;
+import com.chinaitop.depot.system.model.RoleInfoExample;
+import com.chinaitop.depot.system.model.UserInfo;
+import com.chinaitop.depot.system.model.UserInfoExample;
 import com.chinaitop.depot.system.model.UserRole;
 import com.chinaitop.depot.system.model.UserRoleExample;
+import com.chinaitop.depot.system.model.RoleInfoExample.Criteria;
 import com.chinaitop.depot.system.service.UserRoleService;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +28,18 @@ public class UserRoleServiceImpl implements UserRoleService {
 	
 	@Resource
 	private UserRoleMapper userRoleMapper;
+	
+	@Resource
+	private UserInfoMapper UserInfoMapper;
+	
+	@Resource
+	private RoleInfoMapper RoleInfoMapper;
+	
+	@Resource
+	private FuncInfoMapper funcInfoMapper;
+	
+	@Resource
+	private RoleFuncMapper roleFuncMapper;
 
 	@Override
 	public List<UserRole> queryByExample(UserRoleExample example) {
@@ -41,4 +66,77 @@ public class UserRoleServiceImpl implements UserRoleService {
 		return userRoleMapper.getUserRoleFeign(userId);
 	}
 
+	@Override
+	public void addRoleToUser() {
+		// TODO Auto-generated method stub
+		
+		//查询出 手动增加的 用户的信息
+		UserInfoExample example = new UserInfoExample();
+		example.createCriteria().andUserIdGreaterThanOrEqualTo(10);
+		example.createCriteria().andUserIdLessThanOrEqualTo(72);
+		List<UserInfo> userInfoList = UserInfoMapper.selectByExample(example);
+		
+		
+		//所有的权限信息
+		FuncInfoExample funcExample = new FuncInfoExample();
+		List<FuncInfo> funcInfoList = funcInfoMapper.selectByExample(funcExample);
+	  
+		for(UserInfo userInfo:userInfoList){
+			//查询 改单位下的 管理员 角色的  id
+			
+			RoleInfoExample example1 = new RoleInfoExample();
+			Criteria criteria1 = example1.createCriteria();
+			criteria1.andRoleNameEqualTo("系统管理员");
+			criteria1.andOrgIdEqualTo(userInfo.getOrgId());
+			List<RoleInfo> roleInfoList = RoleInfoMapper.selectByExample(example1);
+			
+			if(roleInfoList.size()>0){
+				/**
+				 * 人员加角色
+				 */
+				//查询 该人员 有没有该角色  有 不处理  无 则增加
+				UserRoleExample example2 = new UserRoleExample();
+				com.chinaitop.depot.system.model.UserRoleExample.Criteria criteria2 = example2.createCriteria();
+				criteria2.andRoleIdEqualTo(roleInfoList.get(0).getRoleId());
+				criteria2.andUserIdEqualTo(userInfo.getUserId());
+				List<UserRole> userRoleList = userRoleMapper.selectByExample(example2);
+				if(userRoleList.size()>0){
+				
+				}else{
+					UserRole userRole = new UserRole();
+					userRole.setUserId(userInfo.getUserId());
+					userRole.setRoleId(roleInfoList.get(0).getRoleId());
+					userRoleMapper.insert(userRole);
+				}
+				
+				/**
+				 * 角色 加 权限
+				 */
+				//查询 该角色 有没有该权限  有 不处理  无 则增加
+				
+				for(FuncInfo funcInfo:funcInfoList){
+					RoleFuncExample example3 = new RoleFuncExample();
+					com.chinaitop.depot.system.model.RoleFuncExample.Criteria criteria3 = example3.createCriteria();
+					criteria3.andRoleIdEqualTo(roleInfoList.get(0).getRoleId());
+					criteria3.andFuncIdEqualTo(funcInfo.getFuncId());
+					List<RoleFunc> roleFuncList = roleFuncMapper.selectByExample(example3); 
+					if(roleFuncList.size()>0){
+						
+					}else{
+						RoleFunc roleFunc = new RoleFunc();
+						roleFunc.setFuncId(funcInfo.getFuncId());
+						roleFunc.setRoleId(roleInfoList.get(0).getRoleId());
+						roleFuncMapper.insert(roleFunc);
+					}
+				}
+				
+			}
+		}
+		
+		
+		
+		
+		
+	}
+
 }