|
@@ -15,9 +15,14 @@ import org.springframework.util.StringUtils;
|
|
|
|
|
|
import com.xt.jygl.common.BaseWebCtl;
|
|
import com.xt.jygl.common.BaseWebCtl;
|
|
import com.xt.jygl.common.Utils;
|
|
import com.xt.jygl.common.Utils;
|
|
|
|
+import com.xt.jygl.gkjcxx.gk.entity.GkEntity;
|
|
|
|
+import com.xt.jygl.gkjcxx.gq.entity.GqEntity;
|
|
|
|
+import com.xt.jygl.gkjcxx.mt.entity.MtEntity;
|
|
import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
|
|
import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.entity.DcsbEntity;
|
|
import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
|
|
import com.xt.jygl.gkjygl.cghzyxxgl.dcsb.service.DcsbService;
|
|
|
|
+import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.BwEntity;
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
|
|
import com.xt.jygl.gkjygl.gkjyr.jyrjbxx.entity.GkjyrEntity;
|
|
|
|
+import com.xtframe.sec.code.entity.CodeEntity;
|
|
import com.xtframe.sec.common.BaseEntity;
|
|
import com.xtframe.sec.common.BaseEntity;
|
|
import com.xtframe.sec.common.PredicateModel;
|
|
import com.xtframe.sec.common.PredicateModel;
|
|
import com.xtframe.sec.common.PredicateModel.Operator;
|
|
import com.xtframe.sec.common.PredicateModel.Operator;
|
|
@@ -28,22 +33,22 @@ import com.xtframe.sec.utils.SecUtils;
|
|
|
|
|
|
@Controller
|
|
@Controller
|
|
@WebService(targetNamespace = "http://webService.jsjy.com/", serviceName = "dcsbService")
|
|
@WebService(targetNamespace = "http://webService.jsjy.com/", serviceName = "dcsbService")
|
|
-//@HandlerChain(file = "handle-chain.xml")
|
|
|
|
|
|
+// @HandlerChain(file = "handle-chain.xml")
|
|
public class DcsbWebService extends BaseWebCtl {
|
|
public class DcsbWebService extends BaseWebCtl {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private DcsbService dcsbService;
|
|
private DcsbService dcsbService;
|
|
-
|
|
|
|
- public boolean queryUser(String userCode,String pwd){
|
|
|
|
|
|
+
|
|
|
|
+ public boolean queryUser(String userCode, String pwd) {
|
|
pwd = SHA256Encrypt(pwd);
|
|
pwd = SHA256Encrypt(pwd);
|
|
UserEntity user = securityMgr.userService().findByUname(userCode);
|
|
UserEntity user = securityMgr.userService().findByUname(userCode);
|
|
- if(user!=null){
|
|
|
|
- if(pwd.equals(user.getPassword())){
|
|
|
|
|
|
+ if (user != null) {
|
|
|
|
+ if (pwd.equals(user.getPassword())) {
|
|
return true;
|
|
return true;
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
- }else{
|
|
|
|
|
|
+ } else {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -68,7 +73,29 @@ public class DcsbWebService extends BaseWebCtl {
|
|
return list.getContent();
|
|
return list.getContent();
|
|
}
|
|
}
|
|
|
|
|
|
- public List<DcsbEntity> queryByParam(String szgkId, String szgqId, String gkjyr, String cm, String zypmc, String bgsj1, String bgsj2, int pageSize) {
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 查询单船申报作业信息
|
|
|
|
+ *
|
|
|
|
+ * @param szdId
|
|
|
|
+ * 所在地
|
|
|
|
+ * @param szgkId
|
|
|
|
+ * 港口
|
|
|
|
+ * @param szgqId
|
|
|
|
+ * 港区
|
|
|
|
+ * @param gkjyr
|
|
|
|
+ * 港口经营人
|
|
|
|
+ * @param cm
|
|
|
|
+ * 船名
|
|
|
|
+ * @param zypmc
|
|
|
|
+ * 作业品名称
|
|
|
|
+ * @param bgsj1
|
|
|
|
+ * 申报时间起
|
|
|
|
+ * @param bgsj2
|
|
|
|
+ * 申报时间止
|
|
|
|
+ * @param pageSize
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public List<DcsbEntity> queryByParam(String szdId, String szgkId, String szgqId, String gkjyr, String cm, String zypmc, String bgsj1, String bgsj2, int pageSize) {
|
|
List<PredicateModel> filterList = new ArrayList<PredicateModel>();
|
|
List<PredicateModel> filterList = new ArrayList<PredicateModel>();
|
|
// 只检索非删除状态记录
|
|
// 只检索非删除状态记录
|
|
addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
|
|
addNotEmptyModel(filterList, "recordStatus", BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
|
|
@@ -125,4 +152,62 @@ public class DcsbWebService extends BaseWebCtl {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 返回当前地市系统的所在地列表
|
|
|
|
+ *
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public List<CodeEntity> listSzd() {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 根据所在地ID查询港口信息
|
|
|
|
+ *
|
|
|
|
+ * @param szdId
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public List<GkEntity> getGkBySzd(String szdId) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 根据港口主键查询港区信息
|
|
|
|
+ *
|
|
|
|
+ * @param gkId
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public List<GqEntity> getGqByGk(String gkId) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 根据经营人主键查询码头信息
|
|
|
|
+ *
|
|
|
|
+ * @param jyrid
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public List<MtEntity> getMtByJyr(String jyrid) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 根据码头主键查询泊位信息
|
|
|
|
+ *
|
|
|
|
+ * @param mtId
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public List<BwEntity> getBwByMt(String mtId) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 获得货物种类,如果id为null则返回第一大类列表,如id不为null,则返回第二大类列表
|
|
|
|
+ *
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ public List<CodeEntity> getHwzl(String id) {
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|